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

chrome/browser/ui/views/frame/opaque_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/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 58 matching lines @@
 
 // In the window corners, the resize areas don't actually expand bigger, but the
 // 16 px at the end of each edge triggers diagonal resizing.
 const int kResizeAreaCornerSize = 16;
 
 #if !defined(OS_WIN)
 // The icon never shrinks below 16 px on a side.
 const int kIconMinimumSize = 16;
 #endif
 
-// This draws button that look like win10 window caption buttons.  The
-// foreground colour is taken from the theme itself, so that it is guaranteed
-// to provide good contrast with the background.
+// This draws buttons that look like win10 window caption buttons.  The
+// foreground colour is taken from the theme itself, to provide good contrast
+// with the background.
 class OpaqueWin10CaptionButton : public views::CustomButton {
  public:
   OpaqueWin10CaptionButton(OpaqueBrowserFrameView* parent, ViewID view_id);
 
   // The width and height of a caption button.  The button is slightly shorter
   // when the browser window is maximized since there is less vertical space.
   const int kWidth = 46;
   const int kHeightNormal = 28;
   const int kHeightMaximized = 20;
 
@@ skipping 378 matching lines @@
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void OpaqueBrowserFrameView::GetWindowMask(const gfx::Size& size,
                                            gfx::Path* window_mask) {
   DCHECK(window_mask);
 
   if (layout_->IsTitleBarCondensed() || frame()->IsFullscreen())
     return;
 
+#if defined(OS_WIN)
+  // On windows 10, windows should not have rounded frames in restored mode.
+  if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
+    window_mask->moveTo(0, 0);
+    window_mask->lineTo(size.width(), 0);
+    window_mask->lineTo(size.width(), size.height());
+    window_mask->lineTo(0, size.height());
+    window_mask->close();
+    return;
+  }
+#endif
+
   views::GetDefaultWindowMask(
       size, frame()->GetCompositor()->device_scale_factor(), window_mask);
 }
 
 void OpaqueBrowserFrameView::ResetWindowControls() {
   restore_button_->SetState(views::CustomButton::STATE_NORMAL);
   minimize_button_->SetState(views::CustomButton::STATE_NORMAL);
   maximize_button_->SetState(views::CustomButton::STATE_NORMAL);
   // The close button isn't affected by this constraint.
 }
@@ skipping 160 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, protected:
 
 // views::View:
 void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing is visible, so don't bother to paint.
 
-  if (layout_->IsTitleBarCondensed())
+  const bool draw_as_maximized = layout_->IsTitleBarCondensed();
+  if (draw_as_maximized)
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
 
   // The window icon and title are painted by their respective views.
   /* TODO(pkasting):  If this window is active, we should also draw a drop
    * shadow on the title.  This is tricky, because we don't want to hardcode a
    * shadow color (since we want to work with various themes), but we can't
    * alpha-blend either (since the Windows text APIs don't really do this).
    * So we'd need to sample the background color at the right location and
    * synthesize a good shadow color. */
 
   if (IsToolbarVisible() && IsTabStripVisible())
     PaintToolbarBackground(canvas);
-  PaintClientEdge(canvas);
+  if (!draw_as_maximized)
+    PaintClientEdge(canvas);
 }
 
 // BrowserNonClientFrameView:
 bool OpaqueBrowserFrameView::ShouldPaintAsThemed() const {
   // Theme app and popup windows if |platform_observer_| wants it.
   return browser_view()->IsBrowserTypeNormal() ||
          platform_observer_->IsUsingSystemTheme();
 }
 
 void OpaqueBrowserFrameView::UpdateAvatar() {
@@ skipping 131 matching lines @@
   return top_area_height;
 }
 
 void OpaqueBrowserFrameView::PaintRestoredFrameBorder(
     gfx::Canvas* canvas) const {
   frame_background_->set_frame_color(GetFrameColor());
   frame_background_->set_theme_image(GetFrameImage());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());
 
-  const ui::ThemeProvider* tp = GetThemeProvider();
-  frame_background_->SetSideImages(
-      tp->GetImageSkiaNamed(IDR_WINDOW_LEFT_SIDE),
-      tp->GetImageSkiaNamed(IDR_WINDOW_TOP_CENTER),
-      tp->GetImageSkiaNamed(IDR_WINDOW_RIGHT_SIDE),
-      tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_CENTER));
-  frame_background_->SetCornerImages(
-      tp->GetImageSkiaNamed(IDR_WINDOW_TOP_LEFT_CORNER),
-      tp->GetImageSkiaNamed(IDR_WINDOW_TOP_RIGHT_CORNER),
-      tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER),
-      tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER));
+#if defined(OS_WIN)
+  // On windows 10 the frame has square corners, so no need for corner images.
+  const bool set_corners = base::win::GetVersion() < base::win::VERSION_WIN10;
+#else
+  const bool set_corners = true;
+#endif
+
+  if (set_corners) {
+    const ui::ThemeProvider* tp = GetThemeProvider();
+    frame_background_->SetSideImages(
+        tp->GetImageSkiaNamed(IDR_WINDOW_LEFT_SIDE),
+        tp->GetImageSkiaNamed(IDR_WINDOW_TOP_CENTER),
+        tp->GetImageSkiaNamed(IDR_WINDOW_RIGHT_SIDE),
+        tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_CENTER));
+
+    frame_background_->SetCornerImages(
+        tp->GetImageSkiaNamed(IDR_WINDOW_TOP_LEFT_CORNER),
+        tp->GetImageSkiaNamed(IDR_WINDOW_TOP_RIGHT_CORNER),
+        tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER),
+        tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER));
+  }
+
   frame_background_->PaintRestored(canvas, this);
 
   // Note: When we don't have a toolbar, we need to draw some kind of bottom
   // edge here.  Because the App Window graphics we use for this have an
   // attached client edge and their sizing algorithm is a little involved, we do
   // all this in PaintRestoredClientEdge().
 }
 
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(
     gfx::Canvas* canvas) const {
@@ skipping 212 matching lines @@
   gfx::Rect side(x, y, kClientEdgeThickness, h);
   canvas->FillRect(side, color);
   if (draw_bottom) {
     canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness),
                                kClientEdgeThickness),
                      color);
   }
   side.Offset(w + kClientEdgeThickness, 0);
   canvas->FillRect(side, color);
 }