Make browser frame square when running on windows 10 with a theme.

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"
@@ skipping 130 matching lines @@
     const gfx::Rect& client_bounds) const {
   int top_height = NonClientTopBorderHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(std::max(0, client_bounds.x() - border_thickness),
                    std::max(0, client_bounds.y() - top_height),
                    client_bounds.width() + (2 * border_thickness),
                    client_bounds.height() + top_height + border_thickness);
 }
 
 int OpaqueBrowserFrameViewLayout::FrameBorderThickness(bool restored) const {
+#if defined(OS_WIN)
+  const int border_thickness =
+      base::win::GetVersion() >= base::win::VERSION_WIN10 ?
+          kFrameBorderThicknessWin10 : kFrameBorderThickness;
+#else
+  const int border_thickness = kFrameBorderThickness;
+#endif
+
   return (!restored && (IsTitleBarCondensed() || delegate_->IsFullscreen())) ?
-      0 : kFrameBorderThickness;
+      0 : border_thickness;
 }
 
 int OpaqueBrowserFrameViewLayout::NonClientBorderThickness() const {
   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(
@@ skipping 320 matching lines @@
     // When we are the first button on the leading side and are the close
     // button, we must flip ourselves, because the close button assets have
     // a little notch to fit in the rounded frame.
     image_button->SetDrawImageMirrored(
         alignment == ALIGN_LEADING && !has_leading_buttons_ &&
             button == close_button_);
   }
 
   // If the window is maximized, align the buttons to its upper edge.
   int extra_height = title_bar_condensed ? extra_caption_y_ : 0;
+#if defined(OS_WIN)
+  const int border_thickness =
+      base::win::GetVersion() >= base::win::VERSION_WIN10 ?
+          kFrameBorderThicknessWin10 : kFrameBorderThickness;
+#else
+  const int border_thickness = kFrameBorderThickness;
+#endif
 
   switch (alignment) {
     case ALIGN_LEADING: {
       if (has_leading_buttons_)
         leading_button_start_ += window_caption_spacing_;
 
       // If we're the first button on the left and maximized, add width to the
       // right hand side of the screen.
       int extra_width = (title_bar_condensed && !has_leading_buttons_) ?
           (kFrameBorderThickness -
@@ skipping 10 matching lines @@
       has_leading_buttons_ = true;
       break;
     }
     case ALIGN_TRAILING: {
       if (has_trailing_buttons_)
         trailing_button_start_ += window_caption_spacing_;
 
       // If we're the first button on the right and maximized, add width to the
       // right hand side of the screen.
       int extra_width = (title_bar_condensed && !has_trailing_buttons_) ?
-        (kFrameBorderThickness -
+        (border_thickness -
          views::NonClientFrameView::kFrameShadowThickness) : 0;
 
       button->SetBounds(
           host->width() - trailing_button_start_ - extra_width -
               button_size.width(),
           caption_y - extra_height,
           button_size.width() + extra_width,
           button_size.height() + extra_height);
 
       trailing_button_start_ += extra_width + button_size.width();
@@ skipping 101 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);
 }