MacViews: Implement event monitoring for a specific window

ui/views/event_monitor_mac.mm

 // Copyright 2014 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 "ui/views/event_monitor_mac.h"

[tapted, 2014/12/10 02:58:27]

nit: import (since it has an `id`)

[Andre, 2014/12/10 22:58:05]

Done.

 
 #include "base/logging.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
 
 namespace views {
 
 // static
-EventMonitor* EventMonitor::Create(ui::EventHandler* event_handler) {
-  return new EventMonitorMac(event_handler);
+scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor(
+    ui::EventHandler* event_handler) {
+  return scoped_ptr<EventMonitor>(new EventMonitorMac(event_handler, nullptr));
 }
 
 // static
+scoped_ptr<EventMonitor> EventMonitor::CreateWindowMonitor(
+    ui::EventHandler* event_handler,
+    gfx::NativeWindow target_window) {
+  return scoped_ptr<EventMonitor>(
+      new EventMonitorMac(event_handler, target_window));
+}
+
+// static
 gfx::Point EventMonitor::GetLastMouseLocation() {
   NSPoint mouseLocation = [NSEvent mouseLocation];
   // Flip coordinates to gfx (0,0 in top-left corner) using primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y;
   return gfx::Point(mouseLocation.x, mouseLocation.y);
 }
 
-EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler) {
+EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler,
+                                 gfx::NativeWindow target_window) {
   DCHECK(event_handler);
   monitor_ = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask
       handler:^NSEvent*(NSEvent* event){
-                  scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event);
-                  event_handler->OnEvent(ui_event.get());
+                  if (!target_window || [event window] == target_window) {

[tapted, 2014/12/10 02:58:27]

So block formatting was taken out of the official style guide because reasons..
clang-format is a bit rubbish since if the argument name is long, it squashes
everything to the right of it. That's kinda happening here.

I think Chrome's preference is to use a 4-space indent from line that has the
opening curly brace, and line up the close curly brace with the start of that
line. (also: a space before the opening curly brace). Here I'd go for

monitor_ = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask
    handler:^NSEvent*(NSEvent* event) {
        if (!target_window || [event window] == target_window) {
          scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event);
          event_handler->OnEvent(ui_event.get());
        }
        return event;
    }];


references: `git grep -A5 ':^' -- '*.mm'` and http://cl/25169862

[Andre, 2014/12/10 22:58:05]

Done.

+                    scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event);
+                    event_handler->OnEvent(ui_event.get());
+                  }
                   return event;
               }];
 }
 
 EventMonitorMac::~EventMonitorMac() {
   [NSEvent removeMonitor:monitor_];
 }
 
 }  // namespace views