Chromium Code Reviews| 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 59839479a40b04f1e4cf2c48deb5b9666dfede6f..6798af40268262ac806eebf6f1868ab991482568 100644 |
| --- a/ui/views/bubble/bubble_dialog_delegate.cc |
| +++ b/ui/views/bubble/bubble_dialog_delegate.cc |
| @@ -104,12 +104,7 @@ ClientView* BubbleDialogDelegateView::CreateClientView(Widget* widget) { |
| 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()); |
|
msw
2017/01/18 18:30:12
optional nit: use |margins_| or |title_margins()|
tapted
2017/01/18 19:49:34
Done.
|
| // Note: In CreateBubble, the call to SizeToContents() will cause |
| // the relayout that this call requires. |
| frame->SetTitleFontList(GetTitleFontList()); |
| @@ -220,10 +215,14 @@ BubbleDialogDelegateView::BubbleDialogDelegateView(View* anchor_view, |
| 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, |
|
msw
2017/01/18 18:30:12
optional nit: use 2-arg ctor
tapted
2017/01/18 19:49:34
Done.
|
| + kPanelVertMargin, kPanelHorizMargin); |
| + title_margins_ = views_delegate |
| + ? views_delegate->GetDialogFrameViewInsets() |
| + : gfx::Insets(kPanelVertMargin, kPanelHorizMargin, 0, |
| + kPanelHorizMargin); |
| if (anchor_view) |
| SetAnchorView(anchor_view); |
| UpdateColorsFromTheme(GetNativeTheme()); |