Explicitly set an icon color for Incognito on Mac.

BUG=http://crbug.com/27867
TEST=incognito icons should be black

Review URL: http://codereview.chromium.org/405008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32216 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 12 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index e8a77cb2..4e326aa 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -1538,17 +1538,21 @@ willPositionSheet:(NSWindow*)sheet
                                                         alpha:1.0];
     [theme setBackgroundColor:incognitoColor];
     [theme setValue:[NSColor blackColor]
-      forAttribute:@"textColor"
-             style:GTMThemeStyleTabBarSelected
-             state:GTMThemeStateActiveWindow];
+       forAttribute:@"textColor"
+              style:GTMThemeStyleTabBarSelected
+              state:GTMThemeStateActiveWindow];
+    [theme setValue:[NSColor blackColor]
+       forAttribute:@"textColor"
+              style:GTMThemeStyleTabBarDeselected
+              state:GTMThemeStateActiveWindow];
     [theme setValue:[NSColor blackColor]
-      forAttribute:@"textColor"
-             style:GTMThemeStyleTabBarDeselected
-             state:GTMThemeStateActiveWindow];
+       forAttribute:@"textColor"
+              style:GTMThemeStyleBookmarksBarButton
+              state:GTMThemeStateActiveWindow];
     [theme setValue:[NSColor blackColor]
-      forAttribute:@"textColor"
-             style:GTMThemeStyleBookmarksBarButton
-             state:GTMThemeStateActiveWindow];
+       forAttribute:@"iconColor"
+              style:GTMThemeStyleToolBarButton
+              state:GTMThemeStateActiveWindow];
     return theme;
   }
 
@@ -1603,9 +1607,9 @@ willPositionSheet:(NSWindow*)sheet
       provider->GetNSImageNamed(IDR_THEME_BUTTON_BACKGROUND);
   if (toolbarButtonImage) {
     [theme setValue:toolbarButtonImage
-     forAttribute:@"backgroundImage"
-            style:GTMThemeStyleToolBarButton
-            state:GTMThemeStateActiveWindow];
+       forAttribute:@"backgroundImage"
+              style:GTMThemeStyleToolBarButton
+              state:GTMThemeStateActiveWindow];
   } else {
     NSColor* startColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.0];
     NSColor* endColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.3];