Chromium Code Reviews| Index: chrome/browser/ui/views/chrome_views_delegate.cc |
| diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc |
| index 0b66f16c6f253790f8348d0e7f26a2467b9087f5..11448563bdccd1ddae60e74079559d3eb36a488a 100644 |
| --- a/chrome/browser/ui/views/chrome_views_delegate.cc |
| +++ b/chrome/browser/ui/views/chrome_views_delegate.cc |
| @@ -548,6 +548,12 @@ int ChromeViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() { |
| return ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing(); |
| } |
| +int ChromeViewsDelegate::GetDialogRelatedControlVerticalSpacing() { |
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial()) |
| + return HarmonyLayoutDelegate::kHarmonyLayoutUnit / 2; |
| + return ViewsDelegate::GetDialogRelatedControlVerticalSpacing(); |
| +} |
| + |
| gfx::Insets ChromeViewsDelegate::GetDialogFrameViewInsets() { |
| if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
| // Titles are inset at the top and sides, but not at the bottom. |
| @@ -558,6 +564,16 @@ gfx::Insets ChromeViewsDelegate::GetDialogFrameViewInsets() { |
| return ViewsDelegate::GetDialogFrameViewInsets(); |
| } |
| +gfx::Insets ChromeViewsDelegate::GetBubbleDialogMargins() { |
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
| + return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit, |
| + HarmonyLayoutDelegate::kHarmonyLayoutUnit, |
| + HarmonyLayoutDelegate::kHarmonyLayoutUnit, |
| + HarmonyLayoutDelegate::kHarmonyLayoutUnit); |
| + } |
| + return ViewsDelegate::GetDialogFrameViewInsets(); |
|
sky
2017/01/05 23:26:40
Is it intentional that you aren't calling GetBubbl
kylix_rd
2017/01/06 14:36:50
Oops.
|
| +} |
| + |
| #if !defined(USE_ASH) |
| views::Widget::InitParams::WindowOpacity |
| ChromeViewsDelegate::GetOpacityForInitParams( |