MacViews: Create abstraction for event monitoring

MacViews: Create abstraction for event monitoring

Use of aura::Env::AddPreTargetHandler won't compile on Mac, so we hide it
behind an interface and add a Mac implementation.

BUG=425229
Committed: https://crrev.com/4a2dcc48c125b74510403b574450f060e8b0c3bc
Cr-Commit-Position: refs/heads/master@{#301563}

[Andre, 2014-10-25 00:00:30]

andresantoso@chromium.org changed reviewers:
+ sky@chromium.org

[Andre, 2014-10-25 00:00:30]

sky@ PTAL

[sky, 2014-10-25 15:16:15]

https://codereview.chromium.org/678823002/diff/20001/ui/views/event_monitor.h
File ui/views/event_monitor.h (right):

https://codereview.chromium.org/678823002/diff/20001/ui/views/event_monitor.h...
ui/views/event_monitor.h:21: static EventMonitor* Create(ui::EventHandler*
event_handler);
constructor/destructor come first.

https://codereview.chromium.org/678823002/diff/20001/ui/views/event_monitor.h...
ui/views/event_monitor.h:26: static gfx::Point GetLastMouseLocation();
Last mouse location doesn't feel like it really relates to event handling. Is
there a better place for this?

[sky, 2014-10-25 15:19:29]

I guess this spot is fine for now as I can't come up with a better one. And
hopefully we can move mac onto aura at some point and nuke this. So, LGTM (when
you fix the ordering issue).

[Andre, 2014-10-27 19:08:44]

https://codereview.chromium.org/678823002/diff/20001/ui/views/event_monitor.h
File ui/views/event_monitor.h (right):

https://codereview.chromium.org/678823002/diff/20001/ui/views/event_monitor.h...
ui/views/event_monitor.h:21: static EventMonitor* Create(ui::EventHandler*
event_handler);
On 2014/10/25 15:16:14, sky wrote:
> constructor/destructor come first.

Done.

[Andre, 2014-10-27 20:56:38]

The CQ bit was checked by andresantoso@chromium.org

[commit-bot: I haz the power, 2014-10-27 20:58:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/678823002/100001

[commit-bot: I haz the power, 2014-10-27 22:13:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-27 22:13:29]

Failed to apply patch for ui/views/mouse_watcher.cc:
While running git apply --index -3 -p1;
  error: patch failed: ui/views/mouse_watcher_aura.cc:27
  Falling back to three-way merge...
  Applied patch to 'ui/views/mouse_watcher.cc' with conflicts.
  U ui/views/mouse_watcher.cc

Patch:   NR  ui/views/mouse_watcher_aura.cc->ui/views/mouse_watcher.cc
Index: ui/views/mouse_watcher.cc
diff --git a/ui/views/mouse_watcher_aura.cc b/ui/views/mouse_watcher.cc
similarity index 90%
rename from ui/views/mouse_watcher_aura.cc
rename to ui/views/mouse_watcher.cc
index
6fa463bdb19cb43b211f589d1d39f5519452d571..a55ffd5e1510f50fc8f977ab468e19d3aa3b191b
100644
--- a/ui/views/mouse_watcher_aura.cc
+++ b/ui/views/mouse_watcher.cc
@@ -9,13 +9,11 @@
 #include "base/event_types.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
-#include "ui/gfx/screen.h"
+#include "ui/views/event_monitor.h"
 
 namespace views {
 
@@ -27,12 +25,8 @@ class MouseWatcher::Observer : public ui::EventHandler {
  public:
   explicit Observer(MouseWatcher* mouse_watcher)
       : mouse_watcher_(mouse_watcher),
+        event_monitor_(views::EventMonitor::Create(this)),
         notify_listener_factory_(this) {
-    aura::Env::GetInstance()->AddPreTargetHandler(this);
-  }
-
-  virtual ~Observer() {
-    aura::Env::GetInstance()->RemovePreTargetHandler(this);
   }
 
   // ui::EventHandler implementation:
@@ -57,8 +51,7 @@ class MouseWatcher::Observer : public ui::EventHandler {
   void HandleMouseEvent(MouseWatcherHost::MouseEventType event_type) {
     // It's safe to use last_mouse_location() here as this function is invoked
     // during event dispatching.
-    if (!host()->Contains(aura::Env::GetInstance()->last_mouse_location(),
-                          event_type)) {
+    if (!host()->Contains(EventMonitor::GetLastMouseLocation(), event_type)) {
       // Mouse moved outside the host's zone, start a timer to notify the
       // listener.
       if (!notify_listener_factory_.HasWeakPtrs()) {
@@ -84,6 +77,7 @@ class MouseWatcher::Observer : public ui::EventHandler {
 
  private:
   MouseWatcher* mouse_watcher_;
+  scoped_ptr<views::EventMonitor> event_monitor_;
 
   // A factory that is used to construct a delayed callback to the listener.
   base::WeakPtrFactory<Observer> notify_listener_factory_;

[Andre, 2014-10-27 23:22:45]

Patchset #7 (id:120001) has been deleted

[Andre, 2014-10-28 03:52:30]

The CQ bit was checked by andresantoso@chromium.org

[commit-bot: I haz the power, 2014-10-28 03:53:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/678823002/140001

[commit-bot: I haz the power, 2014-10-28 04:43:27]

Committed patchset #7 (id:140001)

[commit-bot: I haz the power, 2014-10-28 04:44:19]

Patchset 7 (id:??) landed as
https://crrev.com/4a2dcc48c125b74510403b574450f060e8b0c3bc
Cr-Commit-Position: refs/heads/master@{#301563}