wm: Change the DispatcherClient interface.

chrome/browser/ui/views/first_run_dialog.cc

 // Copyright 2014 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/views/first_run_dialog.h"
 
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/pref_names.h"
@@ skipping 48 matching lines @@
 
     // Use the widget's window itself so that the message loop
     // exists when the dialog is closed by some other means than
     // |Accept|.
     //
     // This is the same trick used in simple_message_box_views.cc, minus the
     // refcounting.
     aura::Window* anchor = dialog->GetWidget()->GetNativeWindow();
     aura::client::DispatcherClient* client =
         aura::client::GetDispatcherClient(anchor->GetRootWindow());
-    client->RunWithDispatcher(NULL);
+    aura::client::DispatcherRunLoop run_loop(client, NULL);
+    dialog->quit_runloop_ = run_loop.QuitClosure();
+    run_loop.Run();
     dialog_shown = true;
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   return dialog_shown;
 }
 
 FirstRunDialog::FirstRunDialog(Profile* profile)
     : profile_(profile),
       make_default_(NULL),
@@ skipping 16 matching lines @@
   layout->StartRowWithPadding(0, 0, 0, related_y);
   report_crashes_ = new views::Checkbox(l10n_util::GetStringUTF16(
       IDS_OPTIONS_ENABLE_LOGGING));
   layout->AddView(report_crashes_);
 }
 
 FirstRunDialog::~FirstRunDialog() {
 }
 
 void FirstRunDialog::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();
 }
 
 views::View* FirstRunDialog::CreateExtraView() {
   views::Link* link = new views::Link(l10n_util::GetStringUTF16(
       IDS_LEARN_MORE));
   link->set_listener(this);
   return link;
 }
 
 void FirstRunDialog::OnClosed() {
@@ skipping 18 matching lines @@
   return true;
 }
 
 int FirstRunDialog::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK;
 }
 
 void FirstRunDialog::LinkClicked(views::Link* source, int event_flags) {
   platform_util::OpenExternal(profile_, GURL(chrome::kLearnMoreReportingURL));
 }