diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/frame/opaque_browser_frame_view.cc | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6c957f7..260d0df 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -697,7 +697,7 @@ void BookmarkBarView::Paint(gfx::Canvas* canvas) { // Draw border SkPaint border_paint; border_paint.setColor( - GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION)); + GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_NTP_HEADER)); border_paint.setStyle(SkPaint::kStroke_Style); border_paint.setAlpha(96); border_paint.setAntiAlias(true); @@ -708,6 +708,10 @@ void BookmarkBarView::Paint(gfx::Canvas* canvas) { } else { gfx::Rect bounds = GetBounds(views::View::APPLY_MIRRORING_TRANSFORMATION); + SkColor theme_toolbar_color = + GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR); + canvas->FillRectInt(theme_toolbar_color, 0, 0, width(), height()); + canvas->TileImageInt(*GetThemeProvider()-> GetBitmapNamed(IDR_THEME_TOOLBAR), GetParent()->GetBounds(views::View::APPLY_MIRRORING_TRANSFORMATION).x() diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 0332a67..13fb540 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -752,6 +752,12 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) { this, &toolbar_origin); toolbar_bounds.set_origin(toolbar_origin); + SkColor theme_toolbar_color = + tp->GetColor(BrowserThemeProvider::COLOR_TOOLBAR); + canvas->FillRectInt(theme_toolbar_color, + toolbar_bounds.x(), toolbar_bounds.y() + 2, + toolbar_bounds.width(), toolbar_bounds.height() - 2); + int strip_height = browser_view_->GetTabStripHeight(); SkBitmap* theme_toolbar = tp->GetBitmapNamed(IDR_THEME_TOOLBAR); @@ -784,11 +790,6 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) { tp->GetBitmapNamed(IDR_CONTENT_TOP_CENTER); canvas->TileImageInt(*toolbar_center, 0, 0, toolbar_bounds.x(), toolbar_bounds.y(), toolbar_bounds.width(), split_point); - int bottom_center_height = - std::min(toolbar_center->height(), toolbar_bounds.height()) - split_point; - canvas->TileImageInt(*toolbar_center, 0, - toolbar_center->height() - bottom_center_height, toolbar_bounds.x(), - bottom_y, toolbar_bounds.width(), bottom_center_height); SkBitmap* toolbar_right = tp->GetBitmapNamed(IDR_CONTENT_TOP_RIGHT_CORNER); canvas->DrawBitmapInt(*toolbar_right, 0, 0, toolbar_right->width(), |