Bug 520724 - Aero Peek preview prefs should be better defined/classified r=rflint
authorRob Arnold <robarnold@cmu.edu>
Tue, 06 Oct 2009 15:57:20 -0400
changeset 33513 54e0f634d9616c0b6b6be62aa776bd66da1b8eb5
parent 33512 a6e59476b690cae7b87f9dbadb756d107ecbef12
child 33514 586c0c651891e12d0a9a5fbf33af091b804417fc
push id9566
push userrobarnold@cmu.edu
push dateTue, 06 Oct 2009 19:59:00 +0000
treeherdermozilla-central@54e0f634d961 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrflint
bugs520724
milestone1.9.3a1pre
Bug 520724 - Aero Peek preview prefs should be better defined/classified r=rflint
browser/app/profile/firefox.js
browser/components/wintaskbar/preview-per-tab.jsm
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -43,22 +43,16 @@
 #  The first character after a period must be alphabetic.
 
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 #define UNIX_BUT_NOT_MAC
 #endif
 #endif
 
-#ifdef XP_WIN
-#ifndef WINCE
-#define WINNT
-#endif
-#endif
-
 pref("general.startup.browser", true);
 
 pref("browser.chromeURL","chrome://browser/content/");
 pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
 pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
 pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul");
 pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul");
 pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
@@ -902,13 +896,15 @@ pref("browser.sessionstore.interval", 60
 
 // Whether to use a panel that looks like an OS X sheet for customization
 #ifdef XP_MACOSX
 pref("toolbar.customization.usesheet", true);
 #else
 pref("toolbar.customization.usesheet", false);
 #endif
 
-#ifdef WINNT
-pref("aeropeek.enable", true);
-pref("aeropeek.maxpreviews", 20);
-pref("aeropeek.cachetime", 20);
+#ifdef XP_WIN
+#ifndef WINCE
+pref("browser.taskbar.previews.enable", true);
+pref("browser.taskbar.previews.max", 20);
+pref("browser.taskbar.previews.cachetime", 20);
 #endif
+#endif
--- a/browser/components/wintaskbar/preview-per-tab.jsm
+++ b/browser/components/wintaskbar/preview-per-tab.jsm
@@ -79,21 +79,21 @@ var EXPORTED_SYMBOLS = ["AeroPeek"];
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
 // Pref to enable/disable preview-per-tab
-const TOGGLE_PREF_NAME = "aeropeek.enable";
+const TOGGLE_PREF_NAME = "browser.taskbar.previews.enable";
 // Pref to determine the magic auto-disable threshold
-const DISABLE_THRESHOLD_PREF_NAME = "aeropeek.maxpreviews";
+const DISABLE_THRESHOLD_PREF_NAME = "browser.taskbar.previews.max";
 // Pref to control the time in seconds that tab contents live in the cache
-const CACHE_EXPIRATION_TIME_PREF_NAME = "aeropeek.cachetime";
+const CACHE_EXPIRATION_TIME_PREF_NAME = "browser.taskbar.previews.cachetime";
 
 const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Various utility properties
 XPCOMUtils.defineLazyServiceGetter(this, "ioSvc",
                                    "@mozilla.org/network/io-service;1",
                                    "nsIIOService");