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

Unified Diff: ui/views/window/dialog_client_view.cc

Issue 2654323002: harmony: convert device chooser (Closed)
Patch Set: s/gfx::Size()// Created 3 years, 10 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
« no previous file with comments | « ui/views/window/dialog_client_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/dialog_client_view.cc
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index ee88f8654e741d8370cbb236fb3f1f24aeef8efb..456ee7a2e0abd4aac4f9936f70254274921a6719 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -68,11 +68,7 @@ void LayoutButton(LabelButton* button,
// DialogClientView, public:
DialogClientView::DialogClientView(Widget* owner, View* contents_view)
- : ClientView(owner, contents_view),
- ok_button_(nullptr),
- cancel_button_(nullptr),
- extra_view_(nullptr),
- delegate_allowed_close_(false) {
+ : ClientView(owner, contents_view) {
button_row_insets_ =
ViewsDelegate::GetInstance()
? ViewsDelegate::GetInstance()->GetDialogButtonInsets()
@@ -192,6 +188,8 @@ gfx::Size DialogClientView::GetPreferredSize() const {
size.Enlarge(0, contents_size.height());
size.set_width(std::max(size.width(), contents_size.width()));
+ size.SetToMax(minimum_size_);
+
return size;
}
« no previous file with comments | « ui/views/window/dialog_client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698