Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1185)

Unified Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Final feedback addressed Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/extensions/chooser_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view.cc b/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
index bda54fce959aedf94dfe41e0c0bb7d534a920d1a..59837e162f7c233d3ec5ea97c236d16509f67ee2 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
#include "chrome/browser/extensions/device_permissions_dialog_controller.h"
#include "chrome/browser/ui/views/device_chooser_content_view.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
#include "components/constrained_window/constrained_window_views.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/browser_thread.h"
@@ -75,11 +75,17 @@ views::ClientView* ChooserDialogView::CreateClientView(views::Widget* widget) {
views::DialogClientView* client =
new views::DialogClientView(widget, GetContentsView());
- LayoutDelegate* delegate = LayoutDelegate::Get();
+ constexpr int kMinWidth = 402;
+ constexpr int kMinHeight = 320;
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ int min_width = provider->GetDialogPreferredWidth(DialogWidth::MEDIUM);
+ if (!min_width)
+ min_width = kMinWidth;
+ client->set_minimum_size(gfx::Size(min_width, kMinHeight));
+
client->set_button_row_insets(gfx::Insets(
- delegate->GetMetric(
- LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING),
- 0, 0, 0));
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL), 0, 0,
+ 0));
return client;
}
@@ -89,8 +95,8 @@ views::NonClientFrameView* ChooserDialogView::CreateNonClientFrameView(
// always be true.
DCHECK(ShouldUseCustomFrame());
return views::DialogDelegate::CreateDialogFrameView(
- widget, gfx::Insets(LayoutDelegate::Get()->GetMetric(
- LayoutDelegate::Metric::PANEL_CONTENT_MARGIN)));
+ widget, gfx::Insets(ChromeLayoutProvider::Get()->GetDistanceMetric(
+ DISTANCE_PANEL_CONTENT_MARGIN)));
}
bool ChooserDialogView::Accept() {

Powered by Google App Engine
This is Rietveld 408576698