Make windows caption buttons look natural on windows 10

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/avatar_button_manager.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h"
 #include "chrome/browser/ui/views/tab_icon_view_model.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/window/non_client_view.h"
 
 class BrowserView;
 class OpaqueBrowserFrameViewLayout;
 class OpaqueBrowserFrameViewPlatformSpecific;
 class TabIconView;
 
 namespace views {
-class ImageButton;
+class CustomButton;
 class FrameBackground;
 class Label;
 }
 
 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
                                public views::ButtonListener,
                                public views::MenuButtonListener,
                                public TabIconViewModel,
                                public OpaqueBrowserFrameViewLayoutDelegate {
  public:
   // Constructs a non-client view for an BrowserFrame.
   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;
   int GetThemeBackgroundXInset() const override;
   void UpdateThrobber(bool running) override;
   gfx::Size GetMinimumSize() const override;
   views::View* GetProfileSwitcherView() const override;
 
   // views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
@@ skipping 34 matching lines @@
   bool IsMaximized() const override;
   bool IsMinimized() const override;
   bool IsFullscreen() const override;
   bool IsTabStripVisible() const override;
   int GetTabStripHeight() const override;
   bool IsToolbarVisible() const override;
   gfx::Size GetTabstripPreferredSize() const override;
   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;
 
   // BrowserNonClientFrameView:
   bool ShouldPaintAsThemed() const override;
   void UpdateAvatar() override;
 
  private:
   // views::NonClientFrameView:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
   // 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
   // calculated as if the window was restored, regardless of its current state.
   int FrameBorderThickness(bool restored) const;
 
   // Returns true if the specified point is within the avatar menu buttons.
   bool IsWithinAvatarMenuButtons(const gfx::Point& point) const;
 
   // Returns the thickness of the entire nonclient left, right, and bottom
@@ skipping 22 matching lines @@
                            int w,
                            int h,
                            bool draw_bottom,
                            SkColor color,
                            gfx::Canvas* canvas) const;
 
   // Our layout manager also calculates various bounds.
   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_;
   views::Label* window_title_;
 
   // Wrapper around the in-frame avatar switcher.
   AvatarButtonManager profile_switcher_;
 
   // Background painter for the window frame.
   scoped_ptr<views::FrameBackground> frame_background_;
 
   // Observer that handles platform dependent configuration.
   scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_