summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 18:05:12 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 18:05:12 +0000
commit25764361236ad16912177780e6bfb3ce4a537dca (patch)
treea5aee7fe119345662da66219f0058eee10c5bd54
parent59f3e6d0f59a671ed2f50d14abbec2708cb709b1 (diff)
downloadchromium_src-25764361236ad16912177780e6bfb3ce4a537dca.zip
chromium_src-25764361236ad16912177780e6bfb3ce4a537dca.tar.gz
chromium_src-25764361236ad16912177780e6bfb3ce4a537dca.tar.bz2
Make sure the text color is set correctly for incognito themes until we theme them correctly
BUG=20707 TEST=tab text appears correctly in incognito. Review URL: http://codereview.chromium.org/196123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26232 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm13
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 3c7b6e8..2e98d78 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -1281,12 +1281,25 @@ willPositionSheet:(NSWindow*)sheet
theme = [[GTMTheme alloc] init]; // "Leak" it in the cache.
cache[key] = theme;
+
+ // TODO(pinkerton): Need to be able to theme the entire incognito window
+ // http://crbug.com/18568 The hardcoding of the colors here will need to be
+ // removed when that bug is addressed, but are here in order for things to be
+ // usable in the meantime.
if (isOffTheRecord) {
NSColor* incognitoColor = [NSColor colorWithCalibratedRed:83/255.0
green:108.0/255.0
blue:140/255.0
alpha:1.0];
[theme setBackgroundColor:incognitoColor];
+ [theme setValue:[NSColor blackColor]
+ forAttribute:@"textColor"
+ style:GTMThemeStyleToolBar
+ state:GTMThemeStateActiveWindow];
+ [theme setValue:[NSColor blackColor]
+ forAttribute:@"textColor"
+ style:GTMThemeStyleTabBarDeselected
+ state:GTMThemeStateActiveWindow];
return theme;
}