Index: chrome/browser/ui/views/detachable_toolbar_view.cc |
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc |
index c0a0e4748bc549f37f0e71fc57f706c9e502a1c5..3adde2e4f2f96284b418ae41b4ff37d354e3986b 100644 |
--- a/chrome/browser/ui/views/detachable_toolbar_view.cc |
+++ b/chrome/browser/ui/views/detachable_toolbar_view.cc |
@@ -26,15 +26,16 @@ const SkColor DetachableToolbarView::kMiddleDividerColor = |
void DetachableToolbarView::PaintBackgroundAttachedMode( |
gfx::Canvas* canvas, |
views::View* view, |
- const gfx::Point& background_origin) { |
- ui::ThemeProvider* tp = view->GetThemeProvider(); |
- canvas->FillRect(view->GetLocalBounds(), |
- tp->GetColor(ThemeService::COLOR_TOOLBAR)); |
- canvas->TileImageInt(*tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR), |
+ const gfx::Point& background_origin, |
+ SkColor toolbar_background_color, |
+ gfx::ImageSkia* toolbar_background_image) { |
+ canvas->FillRect(view->GetLocalBounds(), toolbar_background_color); |
+ canvas->TileImageInt(*toolbar_background_image, |
background_origin.x(), background_origin.y(), 0, 0, |
view->width(), view->height()); |
#if defined(USE_ASH) |
// Ash provides additional lightening at the edges of the toolbar. |
+ ui::ThemeProvider* tp = view->GetThemeProvider(); |
gfx::ImageSkia* toolbar_left = tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_LEFT); |
canvas->TileImageInt(*toolbar_left, |
0, 0, |