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

ui/views/bubble/bubble_dialog_delegate.cc

Index: ui/views/bubble/bubble_dialog_delegate.cc
diff --git a/ui/views/bubble/bubble_dialog_delegate.cc b/ui/views/bubble/bubble_dialog_delegate.cc
index 735a2237bcb536fb0bb272a2fa06b6abff199ae6..848e3407ce8be06454b92e82f12ac1834ebda554 100644
--- a/ui/views/bubble/bubble_dialog_delegate.cc
+++ b/ui/views/bubble/bubble_dialog_delegate.cc
@@ -216,12 +216,14 @@ BubbleDialogDelegateView::BubbleDialogDelegateView(View* anchor_view,
       adjust_if_offscreen_(true),
       parent_window_(NULL) {
   ViewsDelegate* views_delegate = ViewsDelegate::GetInstance();
-  margins_ = views_delegate ? views_delegate->GetBubbleDialogMargins()
-                            : gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
-  title_margins_ = views_delegate
-                       ? views_delegate->GetDialogFrameViewInsets()
-                       : gfx::Insets(kPanelVertMargin, kPanelHorizMargin, 0,
-                                     kPanelHorizMargin);
+  margins_ = views_delegate

[Peter Kasting, 2017/03/09 05:52:11]

Nit: Just assume |views_delegate| is non-null (2 places)

[kylix_rd, 2017/03/09 15:02:32]

Done.

+                 ? views_delegate->GetInsetsMetric(InsetsMetric::BUBBLE_DIALOG)
+                 : gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
+  title_margins_ =
+      views_delegate
+          ? views_delegate->GetInsetsMetric(InsetsMetric::DIALOG_FRAME_VIEW)
+          : gfx::Insets(kPanelVertMargin, kPanelHorizMargin, 0,
+                        kPanelHorizMargin);
   if (anchor_view)
     SetAnchorView(anchor_view);
   UpdateColorsFromTheme(GetNativeTheme());