Change toolbar height for material design on Ash

chrome/browser/ui/views/frame/glass_browser_frame_view.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/glass_browser_frame_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 342 matching lines @@
 void GlassBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
   ui::ThemeProvider* tp = GetThemeProvider();
 
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
   int x = toolbar_bounds.x();
   int w = toolbar_bounds.width();
 
+  const bool mode_material = ui::MaterialDesignController::IsModeMaterial();

[Peter Kasting, 2015/09/09 22:41:53]

When I asked for the opaque and glass frames to be updated, I intended for you
to make a much more substantial change, like the one you've made in the ash
frame, to actually bypass all the existing code in MD and instead draw exactly
what we need where in a simple fashion.

That would still be helpful, so if you can do that, please go ahead.

Otherwise, just revert all the changes in this file and the opaque frame.  The
only functional changes you're making here won't have any effect in my client
anyway since I'm entirely bypassing the code you're modifying, since it's
clearly not what we're going to want in MD.  It will mean more work for me as
I'll need to do the changes I refer to above myself based on your work in the
ash frame, but I'd rather that than add the hacks here, which to some degree
obscure what the correct implementation should be.

[tdanderson, 2015/09/10 19:48:25]

Reverted these changes for now, though I'd like to follow up with you offline
about this.

+
   gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
   gfx::ImageSkia* toolbar_center = tp->GetImageSkiaNamed(
-      IDR_CONTENT_TOP_CENTER);
+      mode_material ? IDR_THEME_TOOLBAR : IDR_CONTENT_TOP_CENTER);
 
   // Tile the toolbar image starting at the frame edge on the left and where
   // the tabstrip is on the top.
   int y = toolbar_bounds.y();
   int dest_y = browser_view()->IsTabStripVisible()
                    ? y + (kFrameShadowThickness * 2)
                    : y;
   canvas->TileImageInt(*theme_toolbar,
                        x + GetThemeBackgroundXInset(),
                        dest_y - GetTopInset(), x,
@@ skipping 36 matching lines @@
 
       // Right edge.
       canvas->DrawImageInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
                            right_x, y);
     } else {
       canvas->TileImageInt(*toolbar_center, x, y, w, toolbar_center->height());
     }
   }
 
   // Draw the content/toolbar separator.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
+  if (mode_material) {
     toolbar_bounds.Inset(kClientEdgeThickness, 0);
     BrowserView::Paint1pxHorizontalLine(
         canvas,
         ThemeProperties::GetDefaultColor(
             ThemeProperties::COLOR_TOOLBAR_SEPARATOR),
         toolbar_bounds);
   } else {
     canvas->FillRect(
         gfx::Rect(x + kClientEdgeThickness,
                   toolbar_bounds.bottom() - kClientEdgeThickness,
@@ skipping 201 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }