Backout bug 613037 r=Dao, a=backout.
authorJim Mathies <jmathies@mozilla.com>
Mon, 07 Feb 2011 07:30:07 -0600
changeset 62090 898e308926dc
parent 61986 68881eaeeebb
child 62091 e1fea09f31bf
push id18586
push userjmathies@mozilla.com
push dateMon, 07 Feb 2011 13:30:53 +0000
treeherdermozilla-central@e1fea09f31bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersDao, backout
bugs613037
milestone2.0b12pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout bug 613037 r=Dao, a=backout.
widget/src/windows/nsUXThemeData.cpp
--- a/widget/src/windows/nsUXThemeData.cpp
+++ b/widget/src/windows/nsUXThemeData.cpp
@@ -354,17 +354,16 @@ nsUXThemeData::UpdateTitlebarInfo(HWND a
 //      theme color (silver, olive, blue)
 //        system colors
 
 struct THEMELIST {
   LPCWSTR name;
   int type;
 };
 
-// When adding themes, update sIsDefaultWindowsTheme settings below.
 const THEMELIST knownThemes[] = {
   { L"aero.msstyles", WINTHEME_AERO },
   { L"luna.msstyles", WINTHEME_LUNA },
   { L"zune.msstyles", WINTHEME_ZUNE },
   { L"royale.msstyles", WINTHEME_ROYALE }
 };
 
 const THEMELIST knownColors[] = {
@@ -427,20 +426,17 @@ nsUXThemeData::UpdateNativeThemeInfo()
       theme = (WindowsTheme)knownThemes[i].type;
       break;
     }
   }
 
   if (theme == WINTHEME_UNRECOGNIZED)
     return;
 
-  if (theme == WINTHEME_AERO ||
-      theme == WINTHEME_LUNA ||
-      theme == WINTHEME_ZUNE ||
-      theme == WINTHEME_ROYALE)
+  if (theme == WINTHEME_AERO || theme == WINTHEME_LUNA)
     sIsDefaultWindowsTheme = PR_TRUE;
   
   if (theme != WINTHEME_LUNA) {
     switch(theme) {
       case WINTHEME_AERO:
         sThemeId = nsILookAndFeel::eWindowsTheme_Aero;
         return;
       case WINTHEME_ZUNE: