Refactor ViewsDelegate and MD-ify the icon-to-text spacing for checkbox and radiobutton

chrome/browser/ui/views/chrome_views_delegate.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_CHROME_VIEWS_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/views/views_delegate.h"
 
 class ScopedKeepAlive;
 
 class ChromeViewsDelegate : public views::ViewsDelegate {
  public:
   ChromeViewsDelegate();
   ~ChromeViewsDelegate() override;
 
+  static ChromeViewsDelegate* GetInstance();
+
   // views::ViewsDelegate:
   void SaveWindowPlacement(const views::Widget* window,
                            const std::string& window_name,
                            const gfx::Rect& bounds,
                            ui::WindowShowState show_state) override;
   bool GetSavedWindowPlacement(const views::Widget* widget,
                                const std::string& window_name,
                                gfx::Rect* bounds,
                                ui::WindowShowState* show_state) const override;
   void NotifyAccessibilityEvent(views::View* view,
@@ skipping 22 matching lines @@
 #endif
   ui::ContextFactory* GetContextFactory() override;
   ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
   std::string GetApplicationName() override;
 #if defined(OS_WIN)
   int GetAppbarAutohideEdges(HMONITOR monitor,
                              const base::Closure& callback) override;
 #endif
   scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner() override;
 
-  gfx::Insets GetDialogButtonInsets() const override;
-  int GetDialogCloseButtonMargin() const override;
-  int GetDialogRelatedButtonHorizontalSpacing() const override;
-  int GetDialogRelatedControlVerticalSpacing() const override;
-  gfx::Insets GetDialogFrameViewInsets() const override;
-  gfx::Insets GetBubbleDialogMargins() const override;
-  int GetButtonMinimumWidth() const override;
-  int GetDialogButtonMinimumWidth() const override;
-  int GetButtonHorizontalPadding() const override;
+  gfx::Insets GetInsetsMetric(views::InsetsMetric metric) const override;
+  int GetSpacingMetric(views::SpacingMetric metric) const override;
 
  private:
 #if defined(OS_WIN)
   typedef std::map<HMONITOR, int> AppbarAutohideEdgeMap;
 
   // Callback on main thread with the edges. |returned_edges| is the value that
   // was returned from the call to GetAutohideEdges() that initiated the lookup.
   void OnGotAppbarAutohideEdges(const base::Closure& callback,
                                 HMONITOR monitor,
                                 int returned_edges,
@@ skipping 18 matching lines @@
   // GetAutohideEdges().start a new query.
   bool in_autohide_edges_callback_;
 
   base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_