Make windows caption buttons look natural on windows 10

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"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/font.h"
+#include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 const int kCaptionButtonHeight = 18;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // Default extra space between the top of the frame and the top of the window
 // caption buttons.
@@ skipping 386 matching lines @@
   switch (button_id) {
     case views::FRAME_BUTTON_MINIMIZE: {
       minimize_button_->SetVisible(true);
       SetBoundsForButton(host, minimize_button_, alignment, caption_y);
       break;
     }
     case views::FRAME_BUTTON_MAXIMIZE: {
       // When the window is restored, we show a maximized button; otherwise, we
       // show a restore button.
       bool is_restored = !delegate_->IsMaximized() && !delegate_->IsMinimized();
-      views::ImageButton* invisible_button = is_restored ?
+      views::CustomButton* invisible_button = is_restored ?
           restore_button_ : maximize_button_;
       invisible_button->SetVisible(false);
 
-      views::ImageButton* visible_button = is_restored ?
+      views::CustomButton* visible_button = is_restored ?
           maximize_button_ : restore_button_;
       visible_button->SetVisible(true);
       SetBoundsForButton(host, visible_button, alignment, caption_y);
       break;
     }
     case views::FRAME_BUTTON_CLOSE: {
       close_button_->SetVisible(true);
       SetBoundsForButton(host, close_button_, alignment, caption_y);
       break;
     }
@@ skipping 10 matching lines @@
       maximize_button_->SetVisible(false);
       break;
     case views::FRAME_BUTTON_CLOSE:
       close_button_->SetVisible(false);
       break;
   }
 }
 
 void OpaqueBrowserFrameViewLayout::SetBoundsForButton(
     views::View* host,
-    views::ImageButton* button,
+    views::CustomButton* button,
     ButtonAlignment alignment,
     int caption_y) {
   gfx::Size button_size = button->GetPreferredSize();
 
-  button->SetImageAlignment(
-      (alignment == ALIGN_LEADING)  ?
-          views::ImageButton::ALIGN_RIGHT : views::ImageButton::ALIGN_LEFT,
-      views::ImageButton::ALIGN_BOTTOM);
+  // If the custom button is actually an ImageButton, get a pointer so that
+  // the image can be further configured.
+  views::ImageButton* image_button =
+      views::ImageButton::kViewClassName == button->GetClassName() ?
+          static_cast<views::ImageButton*>(button) : nullptr;
+
+  if (image_button) {
+    image_button->SetImageAlignment(
+        (alignment == ALIGN_LEADING)  ?
+            views::ImageButton::ALIGN_RIGHT : views::ImageButton::ALIGN_LEFT,
+        views::ImageButton::ALIGN_BOTTOM);
+  }
 
   // There should always be the same number of non-shadow pixels visible to the
   // side of the caption buttons.  In maximized mode we extend buttons to the
   // screen top and the rightmost button to the screen right (or leftmost button
   // to the screen left, for left-aligned buttons) to obey Fitts' Law.
   bool title_bar_condensed = IsTitleBarCondensed();
 
-  // 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.
-  button->SetDrawImageMirrored(alignment == ALIGN_LEADING &&
-                               !has_leading_buttons_ &&
-                               button == close_button_);
+  if (image_button) {
+    // 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;
 
   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.
@@ skipping 38 matching lines @@
 }
 
 void OpaqueBrowserFrameViewLayout::SetView(int id, views::View* view) {
   // Why do things this way instead of having an Init() method, where we're
   // passed the views we'll handle? Because OpaqueBrowserFrameView doesn't own
   // all the views which are part of it. The avatar stuff, for example, will be
   // added and removed by the base class of OpaqueBrowserFrameView.
   switch (id) {
     case VIEW_ID_MINIMIZE_BUTTON:
       if (view) {
-        DCHECK_EQ(std::string(views::ImageButton::kViewClassName),
-                  view->GetClassName());
+        minimize_button_ = views::CustomButton::AsCustomButton(view);
+        DCHECK(nullptr != minimize_button_);
+      } else {
+        minimize_button_ = nullptr;
       }
-      minimize_button_ = static_cast<views::ImageButton*>(view);
       break;
     case VIEW_ID_MAXIMIZE_BUTTON:
       if (view) {
-        DCHECK_EQ(std::string(views::ImageButton::kViewClassName),
-                  view->GetClassName());
+        maximize_button_ = views::CustomButton::AsCustomButton(view);
+        DCHECK(nullptr != maximize_button_);
+      } else {
+        maximize_button_ = nullptr;
       }
-      maximize_button_ = static_cast<views::ImageButton*>(view);
       break;
     case VIEW_ID_RESTORE_BUTTON:
       if (view) {
-        DCHECK_EQ(std::string(views::ImageButton::kViewClassName),
-                  view->GetClassName());
+        restore_button_ = views::CustomButton::AsCustomButton(view);
+        DCHECK(nullptr != restore_button_);
+      } else {
+        restore_button_ = nullptr;
       }
-      restore_button_ = static_cast<views::ImageButton*>(view);
       break;
     case VIEW_ID_CLOSE_BUTTON:
       if (view) {
-        DCHECK_EQ(std::string(views::ImageButton::kViewClassName),
-                  view->GetClassName());
+        close_button_ = views::CustomButton::AsCustomButton(view);
+        DCHECK(nullptr != close_button_);
+      } else {
+        close_button_ = nullptr;
       }
-      close_button_ = static_cast<views::ImageButton*>(view);
       break;
     case VIEW_ID_WINDOW_ICON:
       window_icon_ = view;
       break;
     case VIEW_ID_WINDOW_TITLE:
       if (view) {
         DCHECK_EQ(std::string(views::Label::kViewClassName),
                   view->GetClassName());
       }
       window_title_ = static_cast<views::Label*>(view);
@@ skipping 47 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);
 }