Removes theming from popup windows on Mac

chrome/browser/ui/cocoa/framed_browser_window.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 
 #include "base/logging.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 394 matching lines @@
   // Devtools windows don't get themed.
   if (windowStyle & THEMED_DEVTOOLS)
     return NO;
 
   BOOL active = [[view window] isMainWindow];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
   BOOL popup = windowStyle & THEMED_POPUP;
 
   // Find a theme image.
   NSColor* themeImageColor = nil;
-  int themeImageID;
-  if (popup && active)
-    themeImageID = IDR_THEME_TOOLBAR;
-  else if (popup && !active)
-    themeImageID = IDR_THEME_TAB_BACKGROUND;
-  else if (!popup && active && incognito)
-    themeImageID = IDR_THEME_FRAME_INCOGNITO;
-  else if (!popup && active && !incognito)
-    themeImageID = IDR_THEME_FRAME;
-  else if (!popup && !active && incognito)
-    themeImageID = IDR_THEME_FRAME_INCOGNITO_INACTIVE;
-  else
-    themeImageID = IDR_THEME_FRAME_INACTIVE;
-  if (themeProvider->HasCustomImage(IDR_THEME_FRAME))
-    themeImageColor = themeProvider->GetNSImageColorNamed(themeImageID, true);
+  if (!popup) {
+    int themeImageID;
+    if (active && incognito)
+      themeImageID = IDR_THEME_FRAME_INCOGNITO;
+    else if (active && !incognito)
+      themeImageID = IDR_THEME_FRAME;
+    else if (!active && incognito)
+      themeImageID = IDR_THEME_FRAME_INCOGNITO_INACTIVE;
+    else
+      themeImageID = IDR_THEME_FRAME_INACTIVE;
+    if (themeProvider->HasCustomImage(IDR_THEME_FRAME))
+      themeImageColor = themeProvider->GetNSImageColorNamed(themeImageID, true);
+  }
 
   // If no theme image, use a gradient if incognito.
   NSGradient* gradient = nil;
   if (!themeImageColor && incognito)
     gradient = themeProvider->GetNSGradient(
         active ? ThemeProperties::GRADIENT_FRAME_INCOGNITO :
                  ThemeProperties::GRADIENT_FRAME_INCOGNITO_INACTIVE);
 
   BOOL themed = NO;
   if (themeImageColor) {
@@ skipping 67 matching lines @@
 
   return themed;
 }
 
 - (NSColor*)titleColor {
   ui::ThemeProvider* themeProvider = [self themeProvider];
   if (!themeProvider)
     return [NSColor windowFrameTextColor];
 
   ThemedWindowStyle windowStyle = [self themedWindowStyle];
-  BOOL active = [self isMainWindow];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
-  BOOL popup = windowStyle & THEMED_POPUP;
-
-  NSColor* titleColor = nil;
-  if (popup && active) {
-    titleColor = themeProvider->GetNSColor(
-        ThemeProperties::COLOR_TAB_TEXT, false);
-  } else if (popup && !active) {
-    titleColor = themeProvider->GetNSColor(
-        ThemeProperties::COLOR_BACKGROUND_TAB_TEXT, false);
-  }
-
-  if (titleColor)
-    return titleColor;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
 @end