Show user manager on correct monitor on a multi-monitor system.

BUG=405602
TBR=rogerta@chromium.org

Review URL: https://codereview.chromium.org/495583002

Cr-Commit-Position: refs/heads/master@{#291000}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291000 0039d316-1c4b-4281-b951-d872f2087c98
(cherry picked from commit 5a1c25d4512dc4fcee9385ffef4e79de3577d53d)

Review URL: https://codereview.chromium.org/500133002

Cr-Commit-Position: refs/branch-heads/2125@{#82}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}

2 files changed, 18 insertions, 1 deletions

diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index 1d52acc..bc841c7a 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -33,9 +33,18 @@ DialogDelegate::~DialogDelegate() {
 Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
                                            gfx::NativeWindow context,
                                            gfx::NativeView parent) {
+  return CreateDialogWidgetWithBounds(delegate, context, parent, gfx::Rect());
+}
+
+// static
+Widget* DialogDelegate::CreateDialogWidgetWithBounds(WidgetDelegate* delegate,
+                                                     gfx::NativeWindow context,
+                                                     gfx::NativeView parent,
+                                                     const gfx::Rect& bounds) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.delegate = delegate;
+  params.bounds = bounds;
   DialogDelegate* dialog = delegate->AsDialogDelegate();
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index f627a48..8a2533e 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -32,11 +32,19 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel,
   DialogDelegate();
   virtual ~DialogDelegate();
 
-  // Create a dialog widget with the specified |context| or |parent|.
+  // Same as CreateDialogWidgetWithBounds() with an empty |bounds|.
   static Widget* CreateDialogWidget(WidgetDelegate* delegate,
                                     gfx::NativeWindow context,
                                     gfx::NativeView parent);
 
+  // Create a dialog widget with the specified |context| or |parent|.
+  // If |bounds| is not empty, used to initially place the dialog, otherwise
+  // a default location is used.
+  static Widget* CreateDialogWidgetWithBounds(WidgetDelegate* delegate,
+                                              gfx::NativeWindow context,
+                                              gfx::NativeView parent,
+                                              const gfx::Rect& bounds);
+
   // Override this function to display an extra view adjacent to the buttons.
   // Overrides may construct the view; this will only be called once per dialog.
   virtual View* CreateExtraView();