Chromium Code Reviews| Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
| diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
| index 9addbb159e720ef07e16f56a3dee5bbbcecc0fbe..07cd2976cc2d064387f4bc47ad628651e47e2adf 100644 |
| --- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
| +++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
| @@ -18,6 +18,7 @@ |
| #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
| #include "chrome/browser/ui/views/frame/browser_view.h" |
| #include "chrome/browser/ui/views/frame/top_container_view.h" |
| +#include "chrome/browser/ui/views/harmony/layout_delegate.h" |
| #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
| #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" |
| @@ -54,6 +55,7 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView, |
| bool Accept() override; |
| bool Cancel() override; |
| bool Close() override; |
| + gfx::Size GetPreferredSize() const override; |
| // views::DialogDelegateView: |
| views::View* GetContentsView() override; |
| @@ -142,6 +144,16 @@ bool ChooserBubbleUiViewDelegate::Close() { |
| return true; |
| } |
| +gfx::Size ChooserBubbleUiViewDelegate::GetPreferredSize() const { |
| + constexpr int kHeight = 320; |
|
sky
2017/02/24 21:15:19
I'm assuming these numbers are right.
|
| + constexpr int kDefaultWidth = 402; |
| + int width = LayoutDelegate::Get()->GetDialogPreferredWidth( |
| + LayoutDelegate::DialogWidth::MEDIUM); |
| + if (!width) |
| + width = kDefaultWidth; |
| + return gfx::Size(width, kHeight); |
| +} |
| + |
| views::View* ChooserBubbleUiViewDelegate::GetContentsView() { |
| return device_chooser_content_view_; |
|
tapted
2017/02/28 11:17:33
OK - so here's the trap :)
even though ChooserBu
|
| } |