Make windows caption buttons look natural on windows 10

chrome/browser/ui/views/frame/opaque_browser_frame_view.h

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index e70e8b4ede79d2c9f6a9f2158a3ca52241c2f317..5841aec8654d5cd2a958392aa1c0de695bf1ec3b 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -23,7 +23,7 @@ class OpaqueBrowserFrameViewPlatformSpecific;
 class TabIconView;
 
 namespace views {
-class ImageButton;
+class CustomButton;
 class FrameBackground;
 class Label;
 }
@@ -38,6 +38,8 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
   ~OpaqueBrowserFrameView() override;
 
+  using BrowserNonClientFrameView::GetFrameColor;
+
   // BrowserNonClientFrameView:
   gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
   int GetTopInset(bool restored) const override;
@@ -92,10 +94,10 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   int GetToolbarLeadingCornerClientWidth() const override;
 
  protected:
-  views::ImageButton* minimize_button() const { return minimize_button_; }
-  views::ImageButton* maximize_button() const { return maximize_button_; }
-  views::ImageButton* restore_button() const { return restore_button_; }
-  views::ImageButton* close_button() const { return close_button_; }
+  views::CustomButton* minimize_button() const { return minimize_button_; }
+  views::CustomButton* maximize_button() const { return maximize_button_; }
+  views::CustomButton* restore_button() const { return restore_button_; }
+  views::CustomButton* close_button() const { return close_button_; }
 
   // views::View:
   void OnPaint(gfx::Canvas* canvas) override;
@@ -111,12 +113,12 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
 
   // Creates, adds and returns a new image button with |this| as its listener.
   // Memory is owned by the caller.
-  views::ImageButton* InitWindowCaptionButton(int normal_image_id,
-                                              int hot_image_id,
-                                              int pushed_image_id,
-                                              int mask_image_id,
-                                              int accessibility_string_id,
-                                              ViewID view_id);
+  views::CustomButton* InitWindowCaptionButton(int normal_image_id,
+                                               int hot_image_id,
+                                               int pushed_image_id,
+                                               int mask_image_id,
+                                               int accessibility_string_id,
+                                               ViewID view_id);
 
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.  If |restored| is true, this is
@@ -159,10 +161,10 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   OpaqueBrowserFrameViewLayout* layout_;
 
   // Window controls.
-  views::ImageButton* minimize_button_;
-  views::ImageButton* maximize_button_;
-  views::ImageButton* restore_button_;
-  views::ImageButton* close_button_;
+  views::CustomButton* minimize_button_;
+  views::CustomButton* maximize_button_;
+  views::CustomButton* restore_button_;
+  views::CustomButton* close_button_;
 
   // The window icon and title.
   TabIconView* window_icon_;