Mac: Theme the bookmark bar on the new tab page.

- XIB change: The controller has a connection to buttonView_.
- BrowserThemeProviderMac: Fix a bug where we weren't returning
  default colors; we returned nil instead.
- The majority of the implementation is actually the cross platform
  NtpBackgroundUtil::PaintBackgroundDetachedMode. We do platform
  specific drawing on top of the background, though.

TEST=BookmarkBarToolbarViewTest.DisplayAsFloatingBarWithNoImage
TEST=BookmarkBarToolbarViewTest.DisplayAsFloatingBarWithBgImage
BUG=http://crbug.com/17625

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

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

1 files changed, 11 insertions, 16 deletions

diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/browser_theme_provider_mac.mm
index 6df0336..e27f4ae 100644
--- a/chrome/browser/browser_theme_provider_mac.mm
+++ b/chrome/browser/browser_theme_provider_mac.mm
@@ -75,22 +75,17 @@ NSColor* BrowserThemeProvider::GetNSColor(int id) {
   if (found != nscolor_cache_.end())
     return found->second;
 
-  ColorMap::iterator color_iter = colors_.find(GetColorKey(id));
-  if (color_iter != colors_.end()) {
-    const SkColor& sk_color = color_iter->second;
-
-
-    NSColor* color = [NSColor
-        colorWithCalibratedRed:SkColorGetR(sk_color)/255.0
-                         green:SkColorGetG(sk_color)/255.0
-                          blue:SkColorGetB(sk_color)/255.0
-                         alpha:SkColorGetA(sk_color)/255.0];
-
-    // We loaded successfully.  Cache the color.
-    if (color) {
-      nscolor_cache_[id] = [color retain];
-      return color;
-    }
+  SkColor sk_color = GetColor(id);
+  NSColor* color = [NSColor
+      colorWithCalibratedRed:SkColorGetR(sk_color)/255.0
+                       green:SkColorGetG(sk_color)/255.0
+                        blue:SkColorGetB(sk_color)/255.0
+                       alpha:SkColorGetA(sk_color)/255.0];
+
+  // We loaded successfully.  Cache the color.
+  if (color) {
+    nscolor_cache_[id] = [color retain];
+    return color;
   }
 
   return nil;