Draw popup window toolbars as only containing a location bar.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 610 matching lines @@
   browser_actions_->Layout();
 
   // Extend the app menu to the screen's right edge in maximized mode just like
   // we extend the back button to the left edge.
   if (maximized)
     app_menu_width += insets.right();
   app_menu_button_->SetBounds(next_element_x, child_y, app_menu_width,
                               child_height);
 }
 
-void ToolbarView::OnPaint(gfx::Canvas* canvas) {
-  View::OnPaint(canvas);
-
-  if (is_display_mode_normal())
-    return;
-
-  // For glass, we need to draw a black line below the location bar to separate
-  // it from the content area.  For non-glass, the NonClientView draws the
-  // toolbar background below the location bar for us.
-  // NOTE: Keep this in sync with BrowserView::GetInfoBarSeparatorColor()!
-  if (GetWidget()->ShouldWindowContentsBeTransparent())
-    canvas->FillRect(gfx::Rect(0, height() - 1, width(), 1), SK_ColorBLACK);
-}
-
 void ToolbarView::OnThemeChanged() {
   LoadImages();
 }
 
 const char* ToolbarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   const views::View* focused_view = focus_manager()->GetFocusedView();
   if (focused_view && (focused_view->id() == VIEW_ID_OMNIBOX))
     return false;  // Let the omnibox handle all accelerator events.
   return AccessiblePaneView::AcceleratorPressed(accelerator);
 }
 
-bool ToolbarView::ShouldPaintBackground() const {
-  return display_mode_ == DISPLAYMODE_NORMAL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, protected:
 
 // Override this so that when the user presses F6 to rotate toolbar panes,
 // the location bar gets focus, not the first control in the toolbar - and
 // also so that it selects all content in the location bar.
 bool ToolbarView::SetPaneFocusAndFocusDefault() {
   if (!location_bar_->HasFocus()) {
     SetPaneFocus(location_bar_);
     location_bar_->FocusLocation(true);
@@ skipping 56 matching lines @@
 #if defined(OS_WIN)
       ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
 #endif
     }
     incompatibility_badge_showing = true;
     return;
   }
 }
 
 int ToolbarView::PopupTopSpacing() const {
-  const int kPopupTopSpacingNonGlass = 3;
-  return GetWidget()->ShouldWindowContentsBeTransparent() ?
-      0 : kPopupTopSpacingNonGlass;
+  const int kAdditionalPopupTopSpacingNonGlass = 2;
+  return views::NonClientFrameView::kClientEdgeThickness +
+      (GetWidget()->ShouldWindowContentsBeTransparent() ?
+          0 : kAdditionalPopupTopSpacingNonGlass);
 }
 
 gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
   if (is_display_mode_normal()) {
     // For Material Design the size of the toolbar is computed using the size
     // of the location bar and constant padding values. For non-material the
     // size is based on the provided assets.
     if (ui::MaterialDesignController::IsModeMaterial()) {
       int content_height = std::max(back_->GetPreferredSize().height(),
                                     location_bar_->GetPreferredSize().height());
       int padding = GetLayoutInsets(TOOLBAR).height();
       size.SetToMax(gfx::Size(0, content_height + padding));
     } else {
       gfx::ImageSkia* normal_background =
           GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
       size.SetToMax(
           gfx::Size(0, normal_background->height() - content_shadow_height()));
     }
   } else if (size.height() == 0) {
     // Location mode with a 0 height location bar. If on ash, expand by one
     // pixel to show a border in the title bar, otherwise leave the size as zero
     // height.
     const int kAshBorderSpacing = 1;
     if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
       size.Enlarge(0, kAshBorderSpacing);
   } else {
-    const int kPopupBottomSpacingGlass = 1;
-    const int kPopupBottomSpacingNonGlass = 2;
     size.Enlarge(
-        0,
-        PopupTopSpacing() + (GetWidget()->ShouldWindowContentsBeTransparent() ?
-            kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass));
+        0, PopupTopSpacing() + views::NonClientFrameView::kClientEdgeThickness);
   }
   return size;
 }
 
 void ToolbarView::LoadImages() {
   ui::ThemeProvider* tp = GetThemeProvider();
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     const int kButtonSize = 16;
     const SkColor normal_color =
@@ skipping 53 matching lines @@
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return GetLayoutConstant(
       (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
           TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
 }