Use proper anchor window in SimpleMessageBoxViews

chrome/browser/ui/views/simple_message_box_views.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 "chrome/browser/ui/simple_message_box.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 16 matching lines @@
 
 class SimpleMessageBoxViews : public views::DialogDelegate,
                               public MessageLoop::Dispatcher {
  public:
   SimpleMessageBoxViews(const string16& title,
                         const string16& message,
                         MessageBoxType type);
 
   MessageBoxResult result() const { return result_; }
 
- private:
   virtual ~SimpleMessageBoxViews();
 
   // Overridden from views::DialogDelegate:
   virtual int GetDialogButtons() const OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // Overridden from views::WidgetDelegate:
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // Overridden from MessageLoop::Dispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
+ private:
   const string16 window_title_;
   const MessageBoxType type_;
   MessageBoxResult result_;
   views::MessageBoxView* message_box_view_;
 
   // Set to false as soon as the user clicks a dialog button; this tells the
   // dispatcher we're done.
   bool should_show_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMessageBoxViews);
@@ skipping 86 matching lines @@
 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
                                 const string16& title,
                                 const string16& message,
                                 MessageBoxType type) {
   SimpleMessageBoxViews* dialog =
       new SimpleMessageBoxViews(title, message, type);
 
   views::Widget::CreateWindowWithParent(dialog, parent)->Show();
 
 #if defined(USE_AURA)
-  aura::client::GetDispatcherClient(parent->GetRootWindow())->RunWithDispatcher(
-      dialog, parent, true);
+  // Use the widget's window itself so that the message loop
+  // exists when the dialog is closed by some other means than
+  // |Cancel| or |Accept|.
+  aura::Window* anchor = parent ?
+      parent : dialog->GetWidget()->GetNativeWindow();
+  aura::client::GetDispatcherClient(anchor->GetRootWindow())->
+      RunWithDispatcher(dialog, anchor, true);
 #else
   {
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoopForUI::current());
     MessageLoopForUI::current()->RunWithDispatcher(dialog);
   }
 #endif
-
   return dialog->result();
 }
 
 }  // namespace browser