MacViews: Create abstraction for event monitoring

chrome/browser/ui/views/tabs/tab_drag_controller.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/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/tabs/window_finder.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_function_dispatcher.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/event_monitor.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/window_state.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/env.h"
+#include "ui/aura/window.h"
 #include "ui/wm/core/window_modality_controller.h"
 #endif
 
 using base::UserMetricsAction;
 using content::OpenURLParams;
 using content::WebContents;
 
 // If non-null there is a drag underway.
 static TabDragController* instance_ = NULL;
 
@@ skipping 73 matching lines @@
 // position managed' property during a show and we need the property set to
 // false before WorkspaceLayoutManager sees the visibility change.
 class WindowPositionManagedUpdater : public views::WidgetObserver {
  public:
   virtual void OnWidgetVisibilityChanged(views::Widget* widget,
                                          bool visible) override {
     SetWindowPositionManaged(widget->GetNativeWindow(), false);
   }
 };
 
-// EscapeTracker installs itself as a pre-target handler on aura::Env and runs a
-// callback when it receives the escape key.
+// EscapeTracker installs an event monitor and runs a callback when it receives
+// the escape key.
 class EscapeTracker : public ui::EventHandler {
  public:
   explicit EscapeTracker(const base::Closure& callback)
-      : escape_callback_(callback) {
-    aura::Env::GetInstance()->AddPreTargetHandler(this);
-  }
-
-  virtual ~EscapeTracker() {
-    aura::Env::GetInstance()->RemovePreTargetHandler(this);
+      : escape_callback_(callback),
+        event_monitor_(views::EventMonitor::Create(this)) {
   }
 
  private:
   // ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* key) override {
     if (key->type() == ui::ET_KEY_PRESSED &&
         key->key_code() == ui::VKEY_ESCAPE) {
       escape_callback_.Run();
     }
   }
 
   base::Closure escape_callback_;
+  scoped_ptr<views::EventMonitor> event_monitor_;
 
   DISALLOW_COPY_AND_ASSIGN(EscapeTracker);
 };
 
 }  // namespace
 
 TabDragController::TabDragData::TabDragData()
     : contents(NULL),
       source_model_index(-1),
       attached_tab(NULL),
@@ skipping 1629 matching lines @@
        it != browser_list->end(); ++it) {
     if ((*it)->tab_strip_model()->empty())
       exclude.insert((*it)->window()->GetNativeWindow());
   }
 #endif
   return GetLocalProcessWindowAtPoint(host_desktop_type_,
                                       screen_point,
                                       exclude);
 
 }