Revert of Use the default dispatcher where possible for nested message loops.

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 47 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, anchor);
+    client->RunWithDispatcher(dialog, anchor);
     dialog_shown = true;
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   return dialog_shown;
 }
 
 FirstRunDialog::FirstRunDialog(Profile* profile)
     : profile_(profile),
       make_default_(NULL),
-      report_crashes_(NULL) {
+      report_crashes_(NULL),
+      should_show_dialog_(true) {
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int related_y = views::kRelatedControlVerticalSpacing;
 
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   make_default_ = new views::Checkbox(l10n_util::GetStringUTF16(
       IDS_FR_CUSTOMIZE_DEFAULT_BROWSER));
   make_default_->SetChecked(true);
   layout->AddView(make_default_);
 
   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();
-}
-
 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() {
+  should_show_dialog_ = false;
   first_run::SetShouldShowWelcomePage();
-  Done();
 }
 
 bool FirstRunDialog::Accept() {
+  should_show_dialog_ = false;
   GetWidget()->Hide();
 
   if (report_crashes_ && report_crashes_->checked()) {
     if (GoogleUpdateSettings::SetCollectStatsConsent(true))
       breakpad::InitCrashReporter(std::string());
   } else {
     GoogleUpdateSettings::SetCollectStatsConsent(false);
   }
 
   if (make_default_ && make_default_->checked())
     ShellIntegration::SetAsDefaultBrowser();
 
-  Done();
   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));
 }
+
+uint32_t FirstRunDialog::Dispatch(const base::NativeEvent& event) {
+  uint32_t action = POST_DISPATCH_PERFORM_DEFAULT;
+  if (!should_show_dialog_)
+    action |= POST_DISPATCH_QUIT_LOOP;
+  return action;
+}