Allow themes to change the background of the new tab page....

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 50 matching lines @@
 // Margins around the content.
 static const int kTopMargin = 1;
 static const int kBottomMargin = 2;
 static const int kLeftMargin = 1;
 static const int kRightMargin = 1;
 
 // Preferred height of the bookmarks bar.
 static const int kBarHeight = 29;
 
 // Preferred height of the bookmarks bar when only shown on the new tab page.
-static const int kNewtabBarHeight = 57;
+const int BookmarkBarView::kNewtabBarHeight = 57;
 
 // How inset the bookmarks bar is when displayed on the new tab page. This is
 // in addition to the margins above.
 static const int kNewtabHorizontalPadding = 8;
 static const int kNewtabVerticalPadding = 12;
 
 // Padding between buttons.
 static const int kButtonPadding = 0;
 
 // Command ids used in the menu allowing the user to choose when we're visible.
 static const int kAlwaysShowCommandID = 1;
 
 // Icon to display when one isn't found for the page.
 static SkBitmap* kDefaultFavIcon = NULL;
 
 // Icon used for folders.
 static SkBitmap* kFolderIcon = NULL;
 
 // Border colors for the BookmarBarView.
 static const SkColor kTopBorderColor = SkColorSetRGB(222, 234, 248);
 
-// Background color for when the bookmarks bar is only being displayed on the
-// new tab page - this color should match the background color of the new tab
-// page (white, most likely).
-static const SkColor kNewtabBackgroundColor = SkColorSetRGB(255, 255, 255);
-
 // Border color for the 'new tab' style bookmarks bar.
 static const SkColor kNewtabBorderColor = SkColorSetRGB(195, 206, 224);
 
 // How round the 'new tab' style bookmarks bar is.
 static const int kNewtabBarRoundness = 5;
 
 // Offset for where the menu is shown relative to the bottom of the
 // BookmarkBarView.
 static const int kMenuOffset = 3;
 
@@ skipping 449 matching lines @@
     // We only layout while parented. When we become parented, if our bounds
     // haven't changed, DidChangeBounds won't get invoked and we won't layout.
     // Therefore we always force a layout when added.
     Layout();
   }
 }
 
 void BookmarkBarView::Paint(gfx::Canvas* canvas) {
   if (IsDetachedStyle()) {
     // Draw the background to match the new tab page.
-    canvas->FillRectInt(kNewtabBackgroundColor, 0, 0, width(), height());
+    ThemeProvider* tp = GetThemeProvider();
+    canvas->FillRectInt(
+        tp->GetColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND),
+        0, 0, width(), height());
+
+    int alignment;
+    if (tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT,
+                               &alignment)) {
+      if (alignment & BrowserThemeProvider::ALIGN_TOP) {
+        SkBitmap* ntp_background = tp->GetBitmapNamed(IDR_THEME_NTP_BACKGROUND);
+
+        if (alignment & BrowserThemeProvider::ALIGN_LEFT) {
+          canvas->DrawBitmapInt(*ntp_background, 0, 0);
+        } else if (alignment & BrowserThemeProvider::ALIGN_RIGHT) {
+          canvas->DrawBitmapInt(*ntp_background, width() -
+                                ntp_background->width(), 0);
+        } else {
+          canvas->DrawBitmapInt(*ntp_background, width() / 2-
+                                ntp_background->width() / 2, 0);
+        }
+      }
+    }
 
     // Draw the 'bottom' of the toolbar above our bubble.
     canvas->FillRectInt(ResourceBundle::toolbar_separator_color,
                         0, 0, width(), 1);
 
     SkRect rect;
 
     // As 'hidden' according to the animation is the full in-tab state,
     // we invert the value - when current_state is at '0', we expect the
     // bar to be docked.
@@ skipping 956 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }