Fix a variety of tabstrip positioning issues.

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

 // Copyright 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/browser_non_client_frame_view_ash.h"
 
 #include <algorithm>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/default_header_painter.h"
@@ skipping 41 matching lines @@
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
 #endif
 
 namespace {
 
 #if defined(FRAME_AVATAR_BUTTON)
 // Space between the new avatar button and the minimize button.
 const int kNewAvatarButtonOffset = 5;
 #endif
-// Space between left edge of window and tabstrip.
-const int kTabstripLeftSpacing = 0;
 // Space between right edge of tabstrip and maximize button.
 const int kTabstripRightSpacing = 10;
 // Height of the shadow of the content area, at the top of the toolbar.
 const int kContentShadowHeight = 1;
 // Space between top of window and top of tabstrip for tall headers, such as
 // for restored windows, apps, etc.
 const int kTabstripTopSpacingTall = 7;
 // Space between top of window and top of tabstrip for short headers, such as
 // for maximized windows, pop-ups, etc.
 const int kTabstripTopSpacingShort = 0;
@@ skipping 418 matching lines @@
 
     return !tabstrip->HitTestRect(rect_in_tabstrip_coords) ||
         tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);
   }
 
   // Claim |rect| if it is above the top of the topmost view in the client area.
   return rect.y() < GetTopInset();
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripLeftInset() const {
-  const int icon_width = browser_view()->GetOTRAvatarIcon().width();
-  const int insets_width = GetLayoutInsets(AVATAR_ICON).width();
-  return avatar_button() ? (icon_width + insets_width) : kTabstripLeftSpacing;
+  const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
+  const int avatar_right = avatar_button() ?
+      (insets.left() + browser_view()->GetOTRAvatarIcon().width()) : 0;
+  return avatar_right + insets.right();
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
   int tabstrip_width = kTabstripRightSpacing +
       caption_button_container_->GetPreferredSize().width();
 
 #if defined(FRAME_AVATAR_BUTTON)
   if (new_avatar_button()) {
     tabstrip_width += kNewAvatarButtonOffset +
          new_avatar_button()->GetPreferredSize().width();
@@ skipping 188 matching lines @@
   }
 }
 
 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(),
                              width(), kClientEdgeThickness),
                    ThemeProperties::GetDefaultColor(
                        ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 }