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

ui/views/bubble/bubble_dialog_delegate.cc

 // Copyright 2016 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 "ui/views/bubble/bubble_dialog_delegate.h"
 
 #include "build/build_config.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/default_style.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 198 matching lines @@
       anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
       anchor_widget_(NULL),
       arrow_(arrow),
       mirror_arrow_in_rtl_(PlatformStyle::kMirrorBubbleArrowInRTLByDefault),
       shadow_(BubbleBorder::SMALL_SHADOW),
       color_explicitly_set_(false),
       accept_events_(true),
       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());
 }
 
 gfx::Rect BubbleDialogDelegateView::GetBubbleBounds() {
   // The argument rect has its origin at the bubble's arrow anchor point;
   // its size is the preferred size of the bubble's client view (this view).
   bool anchor_minimized = anchor_widget() && anchor_widget()->IsMinimized();
   return GetBubbleFrameView()->GetUpdatedWindowBounds(
@@ skipping 89 matching lines @@
   // http://crbug.com/474622 for details.
   if (widget == GetWidget() && visible) {
     ui::AXNodeData node_data;
     GetAccessibleNodeData(&node_data);
     if (node_data.role == ui::AX_ROLE_ALERT_DIALOG)
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 }  // namespace views