Fix alignment of title/content on the OIB / Site Settings bubble.

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 86 matching lines @@
 
 ClientView* BubbleDialogDelegateView::CreateClientView(Widget* widget) {
   DialogClientView* client = new DialogClientView(widget, GetContentsView());
   client->set_button_row_insets(gfx::Insets());
   widget->non_client_view()->set_mirror_client_in_rtl(mirror_arrow_in_rtl_);
   return client;
 }
 
 NonClientFrameView* BubbleDialogDelegateView::CreateNonClientFrameView(
     Widget* widget) {
-  ViewsDelegate* views_delegate = ViewsDelegate::GetInstance();
-  BubbleFrameView* frame = new BubbleFrameView(
-      views_delegate ? views_delegate->GetDialogFrameViewInsets()
-                     : gfx::Insets(kPanelVertMargin, kPanelHorizMargin, 0,
-                                   kPanelHorizMargin),
-      margins());
+  BubbleFrameView* frame = new BubbleFrameView(title_margins_, margins_);
   // Note: In CreateBubble, the call to SizeToContents() will cause
   // the relayout that this call requires.
   frame->SetTitleFontList(GetTitleFontList());
   frame->SetFootnoteView(CreateFootnoteView());
 
   BubbleBorder::Arrow adjusted_arrow = arrow();
   if (base::i18n::IsRTL() && mirror_arrow_in_rtl_)
     adjusted_arrow = BubbleBorder::horizontal_mirror(adjusted_arrow);
   frame->SetBubbleBorder(std::unique_ptr<BubbleBorder>(
       new BubbleBorder(adjusted_arrow, shadow(), color())));
@@ skipping 90 matching lines @@
     : close_on_deactivate_(true),
       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) {
-  margins_ = ViewsDelegate::GetInstance()
-                 ? ViewsDelegate::GetInstance()->GetBubbleDialogMargins()
-                 : gfx::Insets(kPanelVertMargin, kPanelHorizMargin,
-                               kPanelVertMargin, kPanelHorizMargin);
+  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);
   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