Merge, a=backout
authorJim Mathies <jmathies@mozilla.com>
Mon, 07 Feb 2011 07:30:23 -0600
changeset 62091 e1fea09f31bf57ccdc9dbf4c259af74acfd8972b
parent 62089 e0b266ea525f755b3e68645728a913553d50f36f (current diff)
parent 62090 898e308926dc78f0777769608d8d7622badf934e (diff)
child 62092 88952ceddd0552e04e594aca15c57b6bb44ed525
push idunknown
push userunknown
push dateunknown
reviewersbackout
milestone2.0b12pre
Merge, a=backout
--- 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: