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

chrome/browser/cocoa/download_shelf_controller.mm

 // Copyright (c) 2009 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/download_shelf_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 27 matching lines @@
 // Duration for download shelf closing animation, in seconds.
 const NSTimeInterval kDownloadShelfCloseDuration = 0.12;
 
 }  // namespace
 
 @interface DownloadShelfController(Private)
 - (void)showDownloadShelf:(BOOL)enable;
 - (void)layoutItems:(BOOL)skipFirst;
 - (void)closed;
 
-- (void)updateTheme:(GTMTheme*)theme;
+- (void)updateTheme;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 @end
 
 
 @implementation DownloadShelfController
 
 - (id)initWithBrowser:(Browser*)browser
        resizeDelegate:(id<ViewResizer>)resizeDelegate {
   if ((self = [super initWithNibName:@"DownloadShelf"
                               bundle:mac_util::MainAppBundle()])) {
@@ skipping 13 matching lines @@
 
     bridge_.reset(new DownloadShelfMac(browser, self));
   }
   return self;
 }
 
 - (void)awakeFromNib {
   NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
   [defaultCenter addObserver:self
                     selector:@selector(themeDidChangeNotification:)
-                        name:kGTMThemeDidChangeNotification
+                        name:kBrowserThemeDidChangeNotification
                       object:nil];
 
   [[self animatableView] setResizeDelegate:resizeDelegate_];
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   NSImage* favicon = rb.GetNSImageNamed(IDR_DOWNLOADS_FAVICON);
   DCHECK(favicon);
   [image_ setImage:favicon];
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   // The controllers will unregister themselves as observers when they are
   // deallocated. No need to do that here.
   [super dealloc];
 }
 
 // Called after the current theme has changed.
-- (void)themeDidChangeNotification:(NSNotification*)aNotification {
-  GTMTheme* theme = [aNotification object];
-  [self updateTheme:theme];
+- (void)themeDidChangeNotification:(NSNotification*)notification {
+  [self updateTheme];
 }
 
 // Adapt appearance to the current theme. Called after theme changes and before
 // this is shown for the first time.
-- (void)updateTheme:(GTMTheme*)theme {
-  // For the default theme, use a blue color for the link. Ideally, we'd want to
-  // compare the current theme id with kDefaultThemeID, but the classic theme
-  // from the gallery does have a different id. Hence, we use the blue color if
-  // the current theme does not change the bookmark text color.
-  BOOL useDefaultColor = YES;
+- (void)updateTheme {
+  NSColor* color = nil;
+
   if (bridge_.get() && bridge_->browser() && bridge_->browser()->profile()) {
     ThemeProvider* provider = bridge_->browser()->profile()->GetThemeProvider();
-    if (provider) {
-      useDefaultColor = provider->GetColor(
-          BrowserThemeProvider::COLOR_BOOKMARK_TEXT) ==
-          BrowserThemeProvider::GetDefaultColor(
-              BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
-    }
+
+    color =
+        provider->GetNSColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT, false);
   }
 
-  NSColor* color = useDefaultColor ?
-      [HyperlinkButtonCell defaultTextColor] :
-      [theme textColorForStyle:GTMThemeStyleBookmarksBarButton
-                         state:GTMThemeStateActiveWindow];
+  if (!color)
+    color = [HyperlinkButtonCell defaultTextColor];
+
   [showAllDownloadsCell_ setTextColor:color];
 }
 
 - (AnimatableView*)animatableView {
   return static_cast<AnimatableView*>([self view]);
 }
 
 - (void)showDownloadsTab:(id)sender {
   bridge_->browser()->ShowDownloadsTab();
 }
@@ skipping 24 matching lines @@
   downloadItemControllers_.reset();
 }
 
 // Show or hide the bar based on the value of |enable|. Handles animating the
 // resize of the content view.
 - (void)showDownloadShelf:(BOOL)enable {
   if ([self isVisible] == enable)
     return;
 
   if ([[self view] window])
-    [self updateTheme:[[self view] gtm_theme]];
+    [self updateTheme];
 
   // Animate the shelf out, but not in.
   // TODO(rohitrao): We do not animate on the way in because Cocoa is already
   // doing a lot of work to set up the download arrow animation.  I've chosen to
   // do no animation over janky animation.  Find a way to make animating in
   // smoother.
   AnimatableView* view = [self animatableView];
   if (enable)
     [view setHeight:shelfHeight_];
   else
@@ skipping 116 matching lines @@
     if (isTransferDone &&
         [itemController download]->safety_state() != DownloadItem::DANGEROUS) {
       [self remove:itemController];
     } else {
       ++i;
     }
   }
 }
 
 @end