Remove unnecessary uses of aura::Env::GetDispatcher

chrome/browser/ui/views/simple_message_box_views.cc

Index: chrome/browser/ui/views/simple_message_box_views.cc
diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc
index fb85878846331398889c9e631f79949aa6303339..3ec8aaff0e13bf4308579e21ff6ab4c867b19abb 100644
--- a/chrome/browser/ui/views/simple_message_box_views.cc
+++ b/chrome/browser/ui/views/simple_message_box_views.cc
@@ -13,20 +13,18 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "grit/generated_resources.h"
+#include "ui/aura/client/dispatcher_client.h"
+#include "ui/aura/env.h"
+#include "ui/aura/root_window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/client/dispatcher_client.h"
-#include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/simple_message_box_win.h"
 #endif
-#endif
 
 namespace chrome {
 
@@ -178,7 +176,7 @@ bool SimpleMessageBoxViews::Dispatch(const base::NativeEvent& event) {
 #if defined(OS_WIN)

[sky, 2014/02/05 14:22:27]

Can you remove these ifdefs entirely and go with 180?

[sadrul, 2014/02/05 14:53:07]

Nice. Done.

   TranslateMessage(&event);
   DispatchMessage(&event);
-#elif defined(USE_AURA)
+#else
   aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
 #endif
   return should_show_dialog_;
@@ -208,7 +206,6 @@ MessageBoxResult ShowMessageBoxImpl(gfx::NativeWindow parent,
       new SimpleMessageBoxViews(title, message, type, yes_text, no_text));
   CreateBrowserModalDialogViews(dialog.get(), parent)->Show();
 
-#if defined(USE_AURA)
   aura::Window* anchor = parent;
   aura::client::DispatcherClient* client = anchor ?
       aura::client::GetDispatcherClient(anchor->GetRootWindow()) : NULL;
@@ -220,14 +217,6 @@ MessageBoxResult ShowMessageBoxImpl(gfx::NativeWindow parent,
     client = aura::client::GetDispatcherClient(anchor->GetRootWindow());
   }
   client->RunWithDispatcher(dialog.get(), anchor, true);
-#else
-  {
-    base::MessageLoop::ScopedNestableTaskAllower allow(
-        base::MessageLoopForUI::current());
-    base::RunLoop run_loop(dialog);
-    run_loop.Run();
-  }
-#endif
   return dialog->result();
 }
 
@@ -241,7 +230,6 @@ MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
       parent, title, message, type, base::string16(), base::string16());
 }
 
-#if defined(USE_AURA)
 MessageBoxResult ShowMessageBoxWithButtonText(gfx::NativeWindow parent,
                                               const base::string16& title,
                                               const base::string16& message,
@@ -250,6 +238,5 @@ MessageBoxResult ShowMessageBoxWithButtonText(gfx::NativeWindow parent,
   return ShowMessageBoxImpl(
       parent, title, message, MESSAGE_BOX_TYPE_QUESTION, yes_text, no_text);
 }
-#endif
 
 }  // namespace chrome