wm: Change the DispatcherClient interface.

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/message_loop.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
@@ skipping 16 matching lines @@
 
 namespace {
 
 class SimpleMessageBoxViews : public views::DialogDelegate {
  public:
   SimpleMessageBoxViews(const base::string16& title,
                         const base::string16& message,
                         MessageBoxType type,
                         const base::string16& yes_text,
                         const base::string16& no_text,
-                        bool is_system_modal,
-                        MessageBoxResult* result);
+                        bool is_system_modal);
   virtual ~SimpleMessageBoxViews();
 
+  MessageBoxResult RunDialogAndGetResult();
+
   // Overridden from views::DialogDelegate:
   virtual int GetDialogButtons() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // Overridden from views::WidgetDelegate:
   virtual base::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;
 
  private:
 
   // This terminates the nested message-loop.
   void Done();
 
   const base::string16 window_title_;
   const MessageBoxType type_;
   base::string16 yes_text_;
   base::string16 no_text_;
   MessageBoxResult* result_;
   bool is_system_modal_;
   views::MessageBoxView* message_box_view_;
+  base::Closure quit_runloop_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMessageBoxViews);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, public:
 
 SimpleMessageBoxViews::SimpleMessageBoxViews(const base::string16& title,
                                              const base::string16& message,
                                              MessageBoxType type,
                                              const base::string16& yes_text,
                                              const base::string16& no_text,
-                                             bool is_system_modal,
-                                             MessageBoxResult* result)
+                                             bool is_system_modal)
     : window_title_(title),
       type_(type),
       yes_text_(yes_text),
       no_text_(no_text),
-      result_(result),
+      result_(NULL),
       is_system_modal_(is_system_modal),
       message_box_view_(new views::MessageBoxView(
           views::MessageBoxView::InitParams(message))) {
-  CHECK(result_);
   if (yes_text_.empty()) {
     if (type_ == MESSAGE_BOX_TYPE_QUESTION)
       yes_text_ =
           l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
     else if (type_ == MESSAGE_BOX_TYPE_OK_CANCEL)
       yes_text_ = l10n_util::GetStringUTF16(IDS_OK);
     else
       yes_text_ = l10n_util::GetStringUTF16(IDS_OK);
   }
 
   if (no_text_.empty()) {
     if (type_ == MESSAGE_BOX_TYPE_QUESTION)
       no_text_ =
           l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
     else if (type_ == MESSAGE_BOX_TYPE_OK_CANCEL)
       no_text_ = l10n_util::GetStringUTF16(IDS_CANCEL);
   }
 }
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
+MessageBoxResult SimpleMessageBoxViews::RunDialogAndGetResult() {
+  MessageBoxResult result = MESSAGE_BOX_RESULT_NO;
+  result_ = &result;
+  // 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 = GetWidget()->GetNativeWindow();
+  aura::client::DispatcherRunLoop run_loop(
+      aura::client::GetDispatcherClient(anchor->GetRootWindow()), NULL);
+  quit_runloop_ = run_loop.QuitClosure();
+  run_loop.Run();
+  return result;
+}
+
 int SimpleMessageBoxViews::GetDialogButtons() const {
   if (type_ == MESSAGE_BOX_TYPE_QUESTION ||
       type_ == MESSAGE_BOX_TYPE_OK_CANCEL) {
     return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
   }
 
   return ui::DIALOG_BUTTON_OK;
 }
 
 base::string16 SimpleMessageBoxViews::GetDialogButtonLabel(
@@ skipping 36 matching lines @@
 }
 
 const views::Widget* SimpleMessageBoxViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, private:
 
 void SimpleMessageBoxViews::Done() {
-  aura::Window* window = GetWidget()->GetNativeView();
-  aura::client::DispatcherClient* client =
-      aura::client::GetDispatcherClient(window->GetRootWindow());
-  client->QuitNestedMessageLoop();
+  CHECK(!quit_runloop_.is_null());
+  quit_runloop_.Run();
 }
 
 #if defined(OS_WIN)
 UINT GetMessageBoxFlagsFromType(MessageBoxType type) {
   UINT flags = MB_SETFOREGROUND;
   switch (type) {
     case MESSAGE_BOX_TYPE_INFORMATION:
       return flags | MB_OK | MB_ICONINFORMATION;
     case MESSAGE_BOX_TYPE_WARNING:
       return flags | MB_OK | MB_ICONWARNING;
@@ skipping 27 matching lines @@
   }
 #else
   if (!base::MessageLoopForUI::IsCurrent() ||
       !ResourceBundle::HasSharedInstance()) {
     LOG(ERROR) << "Unable to show a dialog outside the UI thread message loop: "
                << title << " - " << message;
     return MESSAGE_BOX_RESULT_NO;
   }
 #endif
 
-  MessageBoxResult result = MESSAGE_BOX_RESULT_NO;
-  SimpleMessageBoxViews* dialog = new SimpleMessageBoxViews(
-      title,
-      message,
-      type,
-      yes_text,
-      no_text,
-      parent == NULL,  // is_system_modal
-      &result);
+  SimpleMessageBoxViews* dialog =
+      new SimpleMessageBoxViews(title,
+                                message,
+                                type,
+                                yes_text,
+                                no_text,
+                                parent == NULL  // is_system_modal
+                                );
   CreateBrowserModalDialogViews(dialog, parent)->Show();
 
-  // 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 = dialog->GetWidget()->GetNativeWindow();
-  aura::client::DispatcherClient* client =
-      aura::client::GetDispatcherClient(anchor->GetRootWindow());
-  client->RunWithDispatcher(NULL);
-  // NOTE: |dialog| will have been deleted by the time control returns here.
-
-  return result;
+  // NOTE: |dialog| may have been deleted by the time |RunDialogAndGetResult()|
+  // returns.
+  return dialog->RunDialogAndGetResult();
 }
 
 }  // namespace
 
 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
                                 const base::string16& title,
                                 const base::string16& message,
                                 MessageBoxType type) {
   return ShowMessageBoxImpl(
       parent, title, message, type, base::string16(), base::string16());
 }
 
 MessageBoxResult ShowMessageBoxWithButtonText(gfx::NativeWindow parent,
                                               const base::string16& title,
                                               const base::string16& message,
                                               const base::string16& yes_text,
                                               const base::string16& no_text) {
   return ShowMessageBoxImpl(
       parent, title, message, MESSAGE_BOX_TYPE_QUESTION, yes_text, no_text);
 }
 
 }  // namespace chrome