Aura: Fix gray line at top of toolbar with translucent frames

chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc

 // Copyright (c) 2012 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/ui/views/frame/browser_non_client_frame_view_aura.h"
 
+#include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ skipping 243 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::View overrides:
 
 void BrowserNonClientFrameViewAura::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing visible, don't paint.
   PaintHeader(canvas);
   PaintTitleBar(canvas);
+  PaintToolbarBackground(canvas);
   // Paint the view hierarchy, which draws the caption buttons.
   BrowserNonClientFrameView::OnPaint(canvas);
 }
 
 void BrowserNonClientFrameViewAura::Layout() {
   // Maximized windows and app/popup windows use shorter buttons.
   if (frame()->IsMaximized() ||
       !browser_view()->IsBrowserTypeNormal()) {
     SetButtonImages(close_button_,
                     IDR_AURA_WINDOW_MAXIMIZED_CLOSE,
@@ skipping 176 matching lines @@
   // Header right edge.
   int header_right_height = theme_frame->height() - top_right_height;
   canvas->TileImageInt(*header_right_edge_,
                        width() - header_right_edge_->width(), top_right_height,
                        header_right_edge_->width(), header_right_height);
 
   // We don't draw edges around the content area.  Web content goes flush
   // to the edge of the window.
 }
 
+void BrowserNonClientFrameViewAura::PaintToolbarBackground(
+    gfx::Canvas* canvas) {
+  gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
+  if (toolbar_bounds.IsEmpty())
+    return;
+  gfx::Point toolbar_origin(toolbar_bounds.origin());
+  ConvertPointToView(browser_view(), this, &toolbar_origin);
+  toolbar_bounds.set_origin(toolbar_origin);
+
+  int x = toolbar_bounds.x();
+  int w = toolbar_bounds.width();
+  int y = toolbar_bounds.y();
+  int h = toolbar_bounds.height();
+
+  // Gross hack: We split the toolbar images into two pieces, since sometimes
+  // (popup mode) the toolbar isn't tall enough to show the whole image.  The
+  // split happens between the top shadow section and the bottom gradient
+  // section so that we never break the gradient.
+  int split_point = kFrameShadowThickness * 2;
+  int bottom_y = y + split_point;
+  ui::ThemeProvider* tp = GetThemeProvider();
+  SkBitmap* theme_toolbar = tp->GetBitmapNamed(IDR_THEME_TOOLBAR);
+  int bottom_edge_height = std::min(theme_toolbar->height(), h) - split_point;
+
+  canvas->FillRect(gfx::Rect(x, bottom_y, w, bottom_edge_height),
+                   tp->GetColor(ThemeService::COLOR_TOOLBAR));
+
+  // Paint the main toolbar image.  Since this image is also used to draw the
+  // tab background, we must use the tab strip offset to compute the image
+  // source y position.  If you have to debug this code use an image editor
+  // to paint a diagonal line through the toolbar image and ensure it lines up
+  // across the tab and toolbar.
+  bool restored = !frame()->IsMaximized();
+  canvas->TileImageInt(
+      *theme_toolbar,
+      x, bottom_y - GetHorizontalTabStripVerticalOffset(restored),
+      x, bottom_y,
+      w, theme_toolbar->height());
+
+  SkBitmap* toolbar_center =
+      tp->GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
+  canvas->TileImageInt(*toolbar_center,
+                       0, 0,
+                       x, y,
+                       w, split_point);
+
+  // Draw the content/toolbar separator.
+  canvas->FillRect(gfx::Rect(x + kClientEdgeThickness,
+                             toolbar_bounds.bottom() - kClientEdgeThickness,
+                             w - (2 * kClientEdgeThickness),
+                             kClientEdgeThickness),
+      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
+}
+
 void BrowserNonClientFrameViewAura::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by the TabIconView.
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   if (delegate && delegate->ShouldShowWindowTitle()) {
     int icon_right = window_icon_ ? window_icon_->bounds().right() : 0;
     gfx::Rect title_bounds(
         icon_right + kTitleOffsetX,
         kTitleOffsetY,
         std::max(0, maximize_button_->x() - kTitleLogoSpacing - icon_right),
         BrowserFrame::GetTitleFont().GetHeight());
     canvas->DrawStringInt(delegate->GetWindowTitle(),
                           BrowserFrame::GetTitleFont(),
-                          SK_ColorWHITE,
+                          SK_ColorBLACK,
                           GetMirroredXForRect(title_bounds),
                           title_bounds.y(),
                           title_bounds.width(),
                           title_bounds.height());
   }
 }
 
 SkBitmap* BrowserNonClientFrameViewAura::GetThemeFrameBitmap() const {
   bool is_incognito = browser_view()->IsOffTheRecord();
   int resource_id;
@@ skipping 13 matching lines @@
       return GetCustomBitmap(IDR_THEME_FRAME_INCOGNITO_INACTIVE,
                              IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE);
     }
     return GetCustomBitmap(IDR_THEME_FRAME_INACTIVE,
                            IDR_AURA_WINDOW_HEADER_BASE_INACTIVE);
   }
   // Never theme app and popup windows.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (ShouldPaintAsActive()) {
     resource_id = is_incognito ?
-        IDR_THEME_FRAME_INCOGNITO : IDR_FRAME;
+        IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE :
+        IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
   } else {
     resource_id = is_incognito ?
-        IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE;
+        IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE :
+        IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
   }
   return rb.GetBitmapNamed(resource_id);
 }
 
 SkBitmap* BrowserNonClientFrameViewAura::GetThemeFrameOverlayBitmap() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetBitmapNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }
 
 SkBitmap* BrowserNonClientFrameViewAura::GetCustomBitmap(
     int bitmap_id,
     int fallback_bitmap_id) const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(bitmap_id))
     return tp->GetBitmapNamed(bitmap_id);
   return tp->GetBitmapNamed(fallback_bitmap_id);
 }