Remove unnecessary uses of aura::Env::GetDispatcher

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/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/run_loop.h"
 #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 {
 
 namespace {
 
 // Multiple SimpleMessageBoxViews can show up at the same time. Each of these
 // start a nested message-loop. However, these SimpleMessageBoxViews can be
 // deleted in any order. This creates problems if a box in an inner-loop gets
 // destroyed before a box in an outer-loop. So to avoid this, ref-counting is
 // used so that the SimpleMessageBoxViews gets deleted at the right time.
@@ skipping 128 matching lines @@
 
 views::Widget* SimpleMessageBoxViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* SimpleMessageBoxViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 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_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, private:
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
 MessageBoxResult ShowMessageBoxImpl(gfx::NativeWindow parent,
                                     const base::string16& title,
                                     const base::string16& message,
                                     MessageBoxType type,
                                     const base::string16& yes_text,
                                     const base::string16& no_text) {
 
 #if defined(OS_WIN)
   // If we're very early, we can't show a GPU-based dialog, so fallback to
   // plain Windows MessageBox.
   if (!ui::ContextFactory::GetInstance())
     return NativeShowMessageBox(NULL, title, message, type);
 #endif
 
   scoped_refptr<SimpleMessageBoxViews> dialog(
       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;
   if (!client) {
     // 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|.
     anchor = dialog->GetWidget()->GetNativeWindow();
     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();
 }
 
 }  // 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());
 }
 
-#if defined(USE_AURA)
 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);
 }
-#endif
 
 }  // namespace chrome