Fix opaque frame app mode windows to have correct toolbar/content separator.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.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/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
 #endif
 
 namespace {
 
 // Besides the frame border, there's empty space atop the window in restored
 // mode, to use to drag the window around.
 const int kNonClientRestoredExtraThickness = 11;
 
 // The titlebar never shrinks too short to show the caption button plus some
 // padding below it.
-const int kCaptionButtonHeightWithPadding = 19;
+const int kCaptionButtonHeight = 18;
+const int kTitleBarAdditionalPadding = 3;
 
 // There is a 5 px gap between the title text and the caption buttons.
 const int kTitleLogoSpacing = 5;
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
 // each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 
 // The titlebar has a 2 px 3D edge along the top and bottom.
 const int kTitlebarTopAndBottomEdgeThickness = 2;
@@ skipping 168 matching lines @@
   const int frame = FrameBorderThickness(false);
   // When we fill the screen, we don't show a client edge.
   return (IsTitleBarCondensed() || delegate_->IsFullscreen()) ?
       frame : (frame + views::NonClientFrameView::kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameViewLayout::NonClientTopBorderHeight(
     bool restored) const {
   if (delegate_->ShouldShowWindowTitle()) {
     return std::max(FrameBorderThickness(restored) + delegate_->GetIconSize(),
-        CaptionButtonY(restored) + kCaptionButtonHeightWithPadding) +
+                    CaptionButtonY(restored) + kCaptionButtonHeight) +
         TitlebarBottomThickness(restored);
   }
 
   int thickness = FrameBorderThickness(restored);
   if (!restored && delegate_->IsTabStripVisible() && IsTitleBarCondensed())
     thickness -= kTabstripTopShadowThickness;
   return thickness;
 }
 
 int OpaqueBrowserFrameViewLayout::GetTabStripInsetsTop(bool restored) const {
   const int top = NonClientTopBorderHeight(restored);
   // Annoyingly, the pre-MD layout uses different heights for the hit-test
   // exclusion region (which we want here, since we're trying to size the border
   // so that the region above the tab's hit-test zone matches) versus the shadow
   // thickness.
   const int exclusion = GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT);
   return (!restored && (IsTitleBarCondensed() || delegate_->IsFullscreen())) ?
       top : (top + kNonClientRestoredExtraThickness - exclusion);
 }
 
 int OpaqueBrowserFrameViewLayout::TitlebarBottomThickness(bool restored) const {
-  const int edge = kTitlebarTopAndBottomEdgeThickness;
+  int thickness = kTitleBarAdditionalPadding;
+  // If there's a non-empty toolbar, it will render the bottom portion of the
+  // titlebar.
+  if (delegate_->IsToolbarVisible())
+    return thickness;
+  thickness += kTitlebarTopAndBottomEdgeThickness;
   return (!restored && IsTitleBarCondensed()) ?
-      edge : (edge + views::NonClientFrameView::kClientEdgeThickness);
+      thickness : (thickness + views::NonClientFrameView::kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameViewLayout::CaptionButtonY(bool restored) const {
   // Maximized buttons start at window top, since the window has no border. This
   // offset is for the image (the actual clickable bounds extend all the way to
   // the top to take Fitts' Law into account).
   const int frame = (!restored && IsTitleBarCondensed()) ?
       FrameBorderThickness(false) :
       views::NonClientFrameView::kFrameShadowThickness;
   return frame + extra_caption_y_;
@@ skipping 152 matching lines @@
   minimum_size_for_buttons_ += button_width_with_offset;
   trailing_button_start_ += button_width_with_offset;
 
   // In non-maximized mode, allow the new tab button to completely slide under
   // the avatar button.
   if (!IsTitleBarCondensed()) {
     trailing_button_start_ -=
         GetLayoutConstant(NEW_TAB_BUTTON_WIDTH) + kNewTabCaptionNormalSpacing;
   }
 
-  // Do not include the 1px padding that is added for the caption buttons.
-  new_avatar_button_->SetBounds(
-      button_x, button_y, button_width, kCaptionButtonHeightWithPadding - 1);
+  new_avatar_button_->SetBounds(button_x, button_y, button_width,
+                                kCaptionButtonHeight);
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutAvatar(views::View* host) {
   // Even though the avatar is used for both incognito and profiles we always
   // use the incognito icon to layout the avatar button. The profile icon
   // can be customized so we can't depend on its size to perform layout.
   gfx::ImageSkia incognito_icon = delegate_->GetOTRAvatarIcon();
 
   bool avatar_on_right = ShouldAvatarBeOnRight();
   int avatar_bottom = GetTabStripInsetsTop(false) +
@@ skipping 280 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }