Allow the Mac theme provider to give default colors/tints if requested. Switc...

chrome/browser/cocoa/browser_theme_provider_init.mm

 // Copyright (c) 2010 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/cocoa/browser_theme_provider_init.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <map>
 #include <string>
@@ skipping 43 matching lines @@
        forAttribute:@"textColor"
               style:GTMThemeStyleBookmarksBarButton
               state:GTMThemeStateActiveWindow];
     [theme setValue:[NSColor blackColor]
        forAttribute:@"iconColor"
               style:GTMThemeStyleToolBarButton
               state:GTMThemeStateActiveWindow];
     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"
             style:GTMThemeStyleWindow
             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
             state:GTMThemeStateActiveWindow];
 
   [theme setValue:frameInactiveImage
      forAttribute:@"backgroundImage"
             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"
               style:GTMThemeStyleToolBarButton
               state:GTMThemeStateActiveWindow];
   } else {
     NSColor* startColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.0];
     NSColor* endColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.3];
     scoped_nsobject<NSGradient> gradient([[NSGradient alloc]
                                           initWithStartingColor:startColor
                                                     endingColor:endColor]);
 
     [theme setValue:gradient
        forAttribute:@"gradient"
               style:GTMThemeStyleToolBarButton
               state:GTMThemeStateActiveWindow];
 
     [theme setValue:gradient
        forAttribute:@"gradient"
               style:GTMThemeStyleToolBarButton
               state:GTMThemeStateActiveWindow];
   }
 
   NSColor* toolbarButtonIconColor =
-      provider->GetNSColorTint(BrowserThemeProvider::TINT_BUTTONS);
+      provider->GetNSColorTint(BrowserThemeProvider::TINT_BUTTONS, false);
   [theme setValue:toolbarButtonIconColor
      forAttribute:@"iconColor"
             style:GTMThemeStyleToolBarButton
             state:GTMThemeStateActiveWindow];
 
   NSColor* toolbarButtonBorderColor = toolbarButtonIconColor;
   [theme setValue:toolbarButtonBorderColor
      forAttribute:@"borderColor"
             style:GTMThemeStyleToolBar
             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"
               style:GTMThemeStyleWindow
               state:GTMThemeStateActiveWindow];
   }
 
   NSImage* frameOverlayInactiveImage =
-      provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
+      provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE, false);
   if (frameOverlayInactiveImage) {
     [theme setValue:frameOverlayInactiveImage
        forAttribute:@"overlay"
               style:GTMThemeStyleWindow
               state:GTMThemeStateInactiveWindow];
   }
 
   return theme;
 }
 
 
 @end  // @implementation GTMTheme(BrowserThemeProviderInitialization)