| Index: chrome/browser/cocoa/browser_theme_provider_init.mm
|
| ===================================================================
|
| --- chrome/browser/cocoa/browser_theme_provider_init.mm (revision 39221)
|
| +++ chrome/browser/cocoa/browser_theme_provider_init.mm (working copy)
|
| @@ -61,9 +61,9 @@
|
| return theme;
|
| }
|
|
|
| - NSImage* frameImage = provider->GetNSImageNamed(IDR_THEME_FRAME);
|
| + NSImage* frameImage = provider->GetNSImageNamed(IDR_THEME_FRAME, false);
|
| NSImage* frameInactiveImage =
|
| - provider->GetNSImageNamed(IDR_THEME_FRAME_INACTIVE);
|
| + provider->GetNSImageNamed(IDR_THEME_FRAME_INACTIVE, false);
|
|
|
| [theme setValue:frameImage
|
| forAttribute:@"backgroundImage"
|
| @@ -71,21 +71,22 @@
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSColor* tabTextColor =
|
| - provider->GetNSColor(BrowserThemeProvider::COLOR_TAB_TEXT);
|
| + provider->GetNSColor(BrowserThemeProvider::COLOR_TAB_TEXT, false);
|
| [theme setValue:tabTextColor
|
| forAttribute:@"textColor"
|
| style:GTMThemeStyleTabBarSelected
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSColor* tabInactiveTextColor =
|
| - provider->GetNSColor(BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
|
| + provider->GetNSColor(BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT,
|
| + false);
|
| [theme setValue:tabInactiveTextColor
|
| forAttribute:@"textColor"
|
| style:GTMThemeStyleTabBarDeselected
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSColor* bookmarkBarTextColor =
|
| - provider->GetNSColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
|
| + provider->GetNSColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT, false);
|
| [theme setValue:bookmarkBarTextColor
|
| forAttribute:@"textColor"
|
| style:GTMThemeStyleBookmarksBarButton
|
| @@ -96,20 +97,20 @@
|
| style:GTMThemeStyleWindow
|
| state:0];
|
|
|
| - NSImage* toolbarImage = provider->GetNSImageNamed(IDR_THEME_TOOLBAR);
|
| + NSImage* toolbarImage = provider->GetNSImageNamed(IDR_THEME_TOOLBAR, false);
|
| [theme setValue:toolbarImage
|
| forAttribute:@"backgroundImage"
|
| style:GTMThemeStyleToolBar
|
| state:GTMThemeStateActiveWindow];
|
| NSImage* toolbarBackgroundImage =
|
| - provider->GetNSImageNamed(IDR_THEME_TAB_BACKGROUND);
|
| + provider->GetNSImageNamed(IDR_THEME_TAB_BACKGROUND, false);
|
| [theme setValue:toolbarBackgroundImage
|
| forAttribute:@"backgroundImage"
|
| style:GTMThemeStyleTabBarDeselected
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSImage* toolbarButtonImage =
|
| - provider->GetNSImageNamed(IDR_THEME_BUTTON_BACKGROUND);
|
| + provider->GetNSImageNamed(IDR_THEME_BUTTON_BACKGROUND, false);
|
| if (toolbarButtonImage) {
|
| [theme setValue:toolbarButtonImage
|
| forAttribute:@"backgroundImage"
|
| @@ -134,7 +135,7 @@
|
| }
|
|
|
| NSColor* toolbarButtonIconColor =
|
| - provider->GetNSColorTint(BrowserThemeProvider::TINT_BUTTONS);
|
| + provider->GetNSColorTint(BrowserThemeProvider::TINT_BUTTONS, false);
|
| [theme setValue:toolbarButtonIconColor
|
| forAttribute:@"iconColor"
|
| style:GTMThemeStyleToolBarButton
|
| @@ -147,14 +148,14 @@
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSColor* toolbarBackgroundColor =
|
| - provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR);
|
| + provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR, false);
|
| [theme setValue:toolbarBackgroundColor
|
| forAttribute:@"backgroundColor"
|
| style:GTMThemeStyleToolBar
|
| state:GTMThemeStateActiveWindow];
|
|
|
| NSImage* frameOverlayImage =
|
| - provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY);
|
| + provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY, false);
|
| if (frameOverlayImage) {
|
| [theme setValue:frameOverlayImage
|
| forAttribute:@"overlay"
|
| @@ -163,7 +164,7 @@
|
| }
|
|
|
| NSImage* frameOverlayInactiveImage =
|
| - provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
|
| + provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE, false);
|
| if (frameOverlayInactiveImage) {
|
| [theme setValue:frameOverlayInactiveImage
|
| forAttribute:@"overlay"
|
|
|