Fix opaque frame incognito icon and tabstrip positioning.

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 "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/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/base/material_design/material_design_controller.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 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;
 
@@ skipping 11 matching lines @@
 
 // The titlebar has a 2 px 3D edge along the top and bottom.
 const int kTitlebarTopAndBottomEdgeThickness = 2;
 
 // The icon is inset 2 px from the left frame border.
 const int kIconLeftSpacing = 2;
 
 // There is a 4 px gap between the icon and the title text.
 const int kIconTitleSpacing = 4;
 
-// Space between the edge of the avatar and the tabstrip.
-const int kAvatarInnerSpacing = 4;
-
 // How far the new avatar button is from the closest caption button.
 const int kNewAvatarButtonOffset = 5;
 
 // When the title bar is in its normal two row mode (usually the case for
 // restored windows), the New Tab button isn't at the same height as the caption
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionNormalSpacing = 5;
 
 // When the title bar is condensed to one row (as when maximized), the New Tab
@@ skipping 53 matching lines @@
     const std::vector<views::FrameButton>& trailing_buttons) {
   leading_buttons_ = leading_buttons;
   trailing_buttons_ = trailing_buttons;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::GetBoundsForTabStrip(
     const gfx::Size& tabstrip_preferred_size,
     int available_width) const {
   int x = leading_button_start_ + GetLayoutInsets(AVATAR_ICON).right();
   available_width -= x + NewTabCaptionSpacing() + trailing_button_start_;
-  gfx::Rect bounds(x, GetTabStripInsetsTop(false), std::max(0, available_width),
+  return gfx::Rect(x, GetTabStripInsetsTop(false), std::max(0, available_width),
                    tabstrip_preferred_size.height());
-
-  if (delegate_->ShouldShowAvatar() && !ShouldIncognitoIconBeOnRight())
-    bounds.Inset(kAvatarInnerSpacing, 0, 0, 0);
-  return bounds;
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetMinimumSize(
     int available_width) const {
   gfx::Size min_size = delegate_->GetBrowserViewMinimumSize();
   int border_thickness = NonClientBorderThickness();
   min_size.Enlarge(2 * border_thickness,
                    NonClientTopBorderHeight(false) + border_thickness);
 
   // Ensure that we can, at minimum, hold our window controls and avatar icon.
@@ skipping 242 matching lines @@
         GetLayoutSize(NEW_TAB_BUTTON).width() + kNewTabCaptionNormalSpacing;
   }
 
   new_avatar_button_->SetBounds(button_x, button_y, button_width,
                                 kCaptionButtonHeight);
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) {
   const int old_button_size = leading_button_start_ + trailing_button_start_;
 
+  // Any buttons/icon/title were laid out based on the frame border thickness,
+  // but the tabstrip bounds need to be based on the non-client border thickness
+  // on any side where there aren't other buttons forcing a larger inset.
+  const bool md = ui::MaterialDesignController::IsModeMaterial();
+  int min_button_width = NonClientBorderThickness();
+  // In non-MD, the toolbar has a rounded corner that we don't want the tabstrip
+  // to overlap.
+  if (!md && !avatar_button_)
+    min_button_width += delegate_->GetToolbarLeadingCornerClientWidth();
+  leading_button_start_ = std::max(leading_button_start_, min_button_width);
+  // The trailing corner is a mirror of the leading one.
+  trailing_button_start_ = std::max(trailing_button_start_, min_button_width);
+
   if (avatar_button_) {
     const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
     const gfx::Size size(delegate_->GetOTRAvatarIcon().size());
     const int incognito_width = insets.left() + size.width();
     int x;
     if (ShouldIncognitoIconBeOnRight()) {
       trailing_button_start_ += incognito_width;
       x = host->width() - trailing_button_start_;
     } else {
       x = leading_button_start_ + insets.left();
       leading_button_start_ += incognito_width;
     }
     const int bottom = GetTabStripInsetsTop(false) +
         delegate_->GetTabStripHeight() - insets.bottom();
-    int y = IsTitleBarCondensed() ?
-        FrameBorderThickness(false) : (bottom - size.height());
+    const int y = (md || !IsTitleBarCondensed()) ?
+        (bottom - size.height()) : FrameBorderThickness(false);
     avatar_button_->SetBounds(x, y, size.width(), bottom - y);
   }
 
   minimum_size_for_buttons_ +=
       (leading_button_start_ + trailing_button_start_ - old_button_size);
 }
 
 void OpaqueBrowserFrameViewLayout::ConfigureButton(
     views::View* host,
     views::FrameButton button_id,
@@ skipping 184 matching lines @@
   int thickness = FrameBorderThickness(false);
   leading_button_start_ = thickness;
   trailing_button_start_ = thickness;
   minimum_size_for_buttons_ = leading_button_start_ + trailing_button_start_;
   has_leading_buttons_ = false;
   has_trailing_buttons_ = false;
 
   LayoutWindowControls(host);
   LayoutTitleBar(host);
 
-  // We now add a single pixel to the leading spacing. We do this because the
-  // avatar and tab strip start one pixel inward compared to where things start
-  // on the trailing side.
-  leading_button_start_++;
-
   if (delegate_->IsRegularOrGuestSession())
     LayoutNewStyleAvatar(host);
-  else
-    LayoutIncognitoIcon(host);
+  LayoutIncognitoIcon(host);
 
   client_view_bounds_ = CalculateClientAreaBounds(
       host->width(), host->height());
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetPreferredSize(
     const views::View* host) const {
   // This is never used; NonClientView::GetPreferredSize() will be called
   // instead.
   NOTREACHED();
   return gfx::Size();
 }
 
 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);
 }