Don't allow pre-MD pre-Win 10 tabstrips to overlap the toolbar corner on glass.

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 528 matching lines @@
   // or one pixel above the top of the screen in maximized mode.
   int button_y = frame()->IsMaximized() ? (FrameTopBorderHeight(false) - 1) : 1;
   new_avatar_button()->SetBounds(
       button_x,
       button_y,
       label_size.width(),
       gfx::win::GetSystemMetricsInDIP(SM_CYMENUSIZE) + 1);
 }
 
 void GlassBrowserFrameView::LayoutIncognitoIcon() {
+  const bool md = ui::MaterialDesignController::IsModeMaterial();
   const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
   gfx::Size size;
   // During startup it's possible to reach here before the browser view has been
   // added to the view hierarchy.  In this case it won't have a widget and thus
   // can't access the theme provider, which is required to get the incognito
   // icon.  Use an empty size in this case, which will still place the tabstrip
   // at the correct coordinates for a non-incognito window.  We should get
   // another layout call after the browser view has a widget anyway.
   if (browser_view()->GetWidget())
     size = browser_view()->GetOTRAvatarIcon().size();
   int x = NonClientBorderThickness(false);
   // In RTL, the icon needs to start after the caption buttons.
   if (base::i18n::IsRTL()) {
     x = width() - frame()->GetMinimizeButtonOffset() +
         (new_avatar_button() ?
             (new_avatar_button()->width() + kNewAvatarButtonOffset) : 0);
+  } else if (!md && !avatar_button() &&
+             (base::win::GetVersion() < base::win::VERSION_WIN10)) {
+    // In non-MD before Win 10, the toolbar has a rounded corner that we don't
+    // want the tabstrip to overlap.
+    x += browser_view()->GetToolbarBounds().x() - kContentEdgeShadowThickness +
+        GetThemeProvider()->GetImageSkiaNamed(
+            IDR_CONTENT_TOP_LEFT_CORNER)->width();
   }
   const int bottom = GetTopInset(false) + browser_view()->GetTabStripHeight() -
       insets.bottom();
-  const int y = (ui::MaterialDesignController::IsModeMaterial() ||
-                 !frame()->IsMaximized()) ?
+  const int y = (md || !frame()->IsMaximized()) ?
       (bottom - size.height()) : FrameTopBorderHeight(false);
   incognito_bounds_.SetRect(x + (avatar_button() ? insets.left() : 0), y,
                             avatar_button() ? size.width() : 0, bottom - y);
   if (avatar_button())
     avatar_button()->SetBoundsRect(incognito_bounds_);
 }
 
 void GlassBrowserFrameView::LayoutClientView() {
   client_view_bounds_ = CalculateClientAreaBounds();
 }
@@ skipping 94 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;
   }
 }