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

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

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 years, 6 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_delegate.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_delegate.cc
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index d2271142430af71880215d6f500ba21a769db814..4b8a1f9890010f0a94e8d95083fee7e4f593a2ff 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -37,15 +37,19 @@ DialogDelegate::~DialogDelegate() {}
Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent) {
- return CreateDialogWidgetWithBounds(delegate, context, parent, gfx::Rect());
+ views::Widget* widget = new views::Widget;
+ views::Widget::InitParams params =
+ GetDialogWidgetInitParams(delegate, context, parent, gfx::Rect());
+ widget->Init(params);
+ return widget;
}
// static
-Widget* DialogDelegate::CreateDialogWidgetWithBounds(WidgetDelegate* delegate,
- gfx::NativeWindow context,
- gfx::NativeView parent,
- const gfx::Rect& bounds) {
- views::Widget* widget = new views::Widget;
+Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
+ WidgetDelegate* delegate,
+ gfx::NativeWindow context,
+ gfx::NativeView parent,
+ const gfx::Rect& bounds) {
views::Widget::InitParams params;
params.delegate = delegate;
params.bounds = bounds;
@@ -80,8 +84,7 @@ Widget* DialogDelegate::CreateDialogWidgetWithBounds(WidgetDelegate* delegate,
// method behaviors.
params.child = parent && (delegate->GetModalType() == ui::MODAL_TYPE_CHILD);
#endif
- widget->Init(params);
- return widget;
+ return params;
}
View* DialogDelegate::CreateExtraView() {
« no previous file with comments | « ui/views/window/dialog_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698