Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / first_run_dialog.cc

diff --git a/src/chrome/browser/ui/views/first_run_dialog.cc b/src/chrome/browser/ui/views/first_run_dialog.cc
index 38316c4..d6b554e 100644 (file)
--- a/src/chrome/browser/ui/views/first_run_dialog.cc
+++ b/src/chrome/browser/ui/views/first_run_dialog.cc
@@ -65,7 +65,7 @@ bool FirstRunDialog::Show(Profile* profile) {
     aura::Window* anchor = dialog->GetWidget()->GetNativeWindow();
     aura::client::DispatcherClient* client =
         aura::client::GetDispatcherClient(anchor->GetRootWindow());
-    client->RunWithDispatcher(dialog, anchor, true);
+    client->RunWithDispatcher(dialog, anchor);
     dialog_shown = true;
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
@@ -139,7 +139,9 @@ void FirstRunDialog::LinkClicked(views::Link* source, int event_flags) {
   platform_util::OpenExternal(profile_, GURL(chrome::kLearnMoreReportingURL));
 }
 
-bool FirstRunDialog::Dispatch(const base::NativeEvent& event) {
-  aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
-  return should_show_dialog_;
+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;
 }