Implement MD specs for non-tabbed windows in Ash

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 670 matching lines @@
 #if defined(OS_WIN)
       ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
 #endif
     }
     incompatibility_badge_showing = true;
     return;
   }
 }
 
 int ToolbarView::PopupTopSpacing() const {
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return 0;
+
   const int kAdditionalPopupTopSpacingNonGlass = 2;
   return views::NonClientFrameView::kClientEdgeThickness +
       (GetWidget()->ShouldWindowContentsBeTransparent() ?
           0 : kAdditionalPopupTopSpacingNonGlass);
 }
 
 gfx::Size ToolbarView::GetSizeInternal(
     gfx::Size (View::*get_size)() const) const {
   gfx::Size size((location_bar_->*get_size)());
   if (is_display_mode_normal()) {
@@ skipping 28 matching lines @@
                                     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.
+    // Location mode with a 0 height location bar. For pre-material design 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)
+    if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
+        !ui::MaterialDesignController::IsModeMaterial()) {
       size.Enlarge(0, kAshBorderSpacing);
+    }
   } else {
     size.Enlarge(
         0, PopupTopSpacing() + views::NonClientFrameView::kClientEdgeThickness);
   }
   return size;
 }
 
 void ToolbarView::LoadImages() {
   const ui::ThemeProvider* tp = GetThemeProvider();
 
@@ skipping 56 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);
 }