mash: Convert system tray logout button to wm common types

ui/views/window/dialog_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/window/dialog_delegate.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 19 matching lines @@
 // DialogDelegate:
 
 DialogDelegate::DialogDelegate() : supports_custom_frame_(true) {}
 
 DialogDelegate::~DialogDelegate() {}
 
 // static
 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;
   DialogDelegate* dialog = delegate->AsDialogDelegate();
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // The new style doesn't support unparented dialogs on Linux desktop.
   if (dialog)
     dialog->supports_custom_frame_ &= parent != NULL;
 #elif defined(OS_WIN)
@@ skipping 14 matching lines @@
   params.context = context;
   params.parent = parent;
 #if !defined(OS_MACOSX)
   // Web-modal (ui::MODAL_TYPE_CHILD) dialogs with parents are marked as child
   // widgets to prevent top-level window behavior (independent movement, etc).
   // On Mac, however, the parent may be a native window (not a views::Widget),
   // and so the dialog must be considered top-level to gain focus and input
   // method behaviors.
   params.child = parent && (delegate->GetModalType() == ui::MODAL_TYPE_CHILD);
 #endif
-  widget->Init(params);
-  return widget;
+  return params;
 }
 
 View* DialogDelegate::CreateExtraView() {
   return NULL;
 }
 
 bool DialogDelegate::GetExtraViewPadding(int* padding) {
   return false;
 }
 
@@ skipping 155 matching lines @@
   state->role = ui::AX_ROLE_DIALOG;
 }
 
 void DialogDelegateView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this && GetWidget())
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 }  // namespace views