win10: Fix various ui glitches

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"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 11 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/win/hwnd_util.h"
 #include "ui/views/window/client_view.h"
 
 HICON GlassBrowserFrameView::throbber_icons_[
     GlassBrowserFrameView::kThrobberIconCount];
 
 namespace {
-// There are 3 px of client edge drawn inside the outer frame borders.
-const int kNonClientBorderThickness = 3;
+// Size of client edge drawn inside the outer frame borders.
+const int kNonClientBorderThicknessPreWin10 = 3;
+const int kNonClientBorderThicknessWin10 = 1;
 // Besides the frame border, there's another 9 px of empty space atop the
 // window in restored mode, to use to drag the window around.
 const int kNonClientRestoredExtraThickness = 9;
 // In the window corners, the resize areas don't actually expand bigger, but the
 // 16 px at the end of the top and bottom edges triggers diagonal resizing.
 const int kResizeAreaCornerSize = 16;
 // The avatar ends 2 px above the bottom of the tabstrip (which, given the
 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
 // user).
 const int kAvatarBottomSpacing = 2;
@@ skipping 270 matching lines @@
 
 int GlassBrowserFrameView::FrameBorderThickness() const {
   return (frame()->IsMaximized() || frame()->IsFullscreen()) ?
       0 : gfx::win::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
 }
 
 int GlassBrowserFrameView::NonClientBorderThickness() const {
   if (frame()->IsMaximized() || frame()->IsFullscreen())
     return 0;
 
-  return kNonClientBorderThickness;
+  return (base::win::GetVersion() <= base::win::VERSION_WIN8_1)
+             ? kNonClientBorderThicknessPreWin10
+             : kNonClientBorderThicknessWin10;
 }
 
 int GlassBrowserFrameView::NonClientTopBorderHeight() const {
   if (frame()->IsFullscreen())
     return 0;
 
   // We'd like to use FrameBorderThickness() here, but the maximized Aero glass
   // frame has a 0 frame border around most edges and a CYSIZEFRAME-thick border
   // at the top (see AeroGlassFrame::OnGetMinMaxInfo()).
   return gfx::win::GetSystemMetricsInDIP(SM_CYSIZEFRAME) +
       (!frame()->ShouldLeaveOffsetNearTopBorder() ?
       -kTabstripTopShadowThickness : kNonClientRestoredExtraThickness);
 }
 
 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();
-  int left_x = x - kContentEdgeShadowThickness;
 
   gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
-  gfx::ImageSkia* toolbar_left = tp->GetImageSkiaNamed(
-      IDR_CONTENT_TOP_LEFT_CORNER);
   gfx::ImageSkia* toolbar_center = tp->GetImageSkiaNamed(
       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,
                        dest_y, w, theme_toolbar->height());
 
   if (browser_view()->IsTabStripVisible()) {
-    // Draw rounded corners for the tab.
-    gfx::ImageSkia* toolbar_left_mask =
-        tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
-    gfx::ImageSkia* toolbar_right_mask =
-        tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER_MASK);
+    // On Windows 10, we don't draw our own window border but rather go right to
+    // the system border, so we don't need to draw the toolbar edges.
+    if (base::win::GetVersion() < base::win::VERSION_WIN10) {
+      int left_x = x - kContentEdgeShadowThickness;
+      // Draw rounded corners for the tab.
+      gfx::ImageSkia* toolbar_left_mask =
+          tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
+      gfx::ImageSkia* toolbar_right_mask =
+          tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER_MASK);
 
-    // We mask out the corners by using the DestinationIn transfer mode,
-    // which keeps the RGB pixels from the destination and the alpha from
-    // the source.
-    SkPaint paint;
-    paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
+      // We mask out the corners by using the DestinationIn transfer mode,
+      // which keeps the RGB pixels from the destination and the alpha from
+      // the source.
+      SkPaint paint;
+      paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
 
-    // Mask out the top left corner.
-    canvas->DrawImageInt(*toolbar_left_mask, left_x, y, paint);
+      // Mask out the top left corner.
+      canvas->DrawImageInt(*toolbar_left_mask, left_x, y, paint);
 
-    // Mask out the top right corner.
-    int right_x =
-        x + w + kContentEdgeShadowThickness - toolbar_right_mask->width();
-    canvas->DrawImageInt(*toolbar_right_mask, right_x, y, paint);
+      // Mask out the top right corner.
+      int right_x =
+          x + w + kContentEdgeShadowThickness - toolbar_right_mask->width();
+      canvas->DrawImageInt(*toolbar_right_mask, right_x, y, paint);
 
-    // Draw left edge.
-    canvas->DrawImageInt(*toolbar_left, left_x, y);
+      // Draw left edge.
+      gfx::ImageSkia* toolbar_left =
+          tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER);
+      canvas->DrawImageInt(*toolbar_left, left_x, y);
 
-    // Draw center edge.
-    canvas->TileImageInt(*toolbar_center, left_x + toolbar_left->width(), y,
-        right_x - (left_x + toolbar_left->width()), toolbar_center->height());
+      // Draw center edge.
+      canvas->TileImageInt(*toolbar_center, left_x + toolbar_left->width(), y,
+                           right_x - (left_x + toolbar_left->width()),
+                           toolbar_center->height());
 
-    // Right edge.
-    canvas->DrawImageInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
-                         right_x, y);
+      // 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.
   canvas->FillRect(
       gfx::Rect(x + kClientEdgeThickness,
                 toolbar_bounds.bottom() - kClientEdgeThickness,
                 w - (2 * kClientEdgeThickness),
                 kClientEdgeThickness),
       ThemeProperties::GetDefaultColor(
           ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
@@ skipping 196 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;
   }
 }