Removes mouse listeners from UserInputMonitor.

media/base/user_input_monitor_win.cc

Index: media/base/user_input_monitor_win.cc
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc
index 12446013f74d3a344e6a65237beb14c1095b5ca7..e3ed703c55b8a1e954e4ae3884ff22ec93262f08 100644
--- a/media/base/user_input_monitor_win.cc
+++ b/media/base/user_input_monitor_win.cc
@@ -26,7 +26,6 @@ namespace {
 
 // From the HID Usage Tables specification.
 const USHORT kGenericDesktopPage = 1;
-const USHORT kMouseUsage = 2;
 const USHORT kKeyboardUsage = 6;
 
 // This is the actual implementation of event monitoring. It's separated from
@@ -41,9 +40,7 @@ class UserInputMonitorWinCore
   };
 
   explicit UserInputMonitorWinCore(
-      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-      const scoped_refptr<UserInputMonitor::MouseListenerList>&
-          mouse_listeners);
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
   ~UserInputMonitorWinCore() override;
 
   // DestructionObserver overrides.
@@ -65,8 +62,6 @@ class UserInputMonitorWinCore
 
   // Task runner on which |window_| is created.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-  scoped_refptr<base::ObserverListThreadSafe<
-      UserInputMonitor::MouseEventListener>> mouse_listeners_;
 
   // These members are only accessed on the UI thread.
   std::unique_ptr<base::win::MessageWindow> window_;
@@ -89,8 +84,6 @@ class UserInputMonitorWin : public UserInputMonitor {
   // Private UserInputMonitor overrides.
   void StartKeyboardMonitoring() override;
   void StopKeyboardMonitoring() override;
-  void StartMouseMonitoring() override;
-  void StopMouseMonitoring() override;
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   UserInputMonitorWinCore* core_;
@@ -99,11 +92,8 @@ class UserInputMonitorWin : public UserInputMonitor {
 };
 
 UserInputMonitorWinCore::UserInputMonitorWinCore(
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    const scoped_refptr<UserInputMonitor::MouseListenerList>& mouse_listeners)
-    : ui_task_runner_(ui_task_runner),
-      mouse_listeners_(mouse_listeners),
-      events_monitored_(0) {}
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
+    : ui_task_runner_(ui_task_runner), events_monitored_(0) {}
 
 UserInputMonitorWinCore::~UserInputMonitorWinCore() {
   DCHECK(!window_);
@@ -139,7 +129,7 @@ void UserInputMonitorWinCore::StartMonitor(EventBitMask type) {
     }
   }
 
-  // Register to receive raw mouse and/or keyboard input.
+  // Register to receive raw keyboard input.
   std::unique_ptr<RAWINPUTDEVICE> device(
       GetRawInputDevices(type, RIDEV_INPUTSINK));

[Wez, 2017/01/03 23:59:40]

You're removing mouse event support so you can replace GetRawInputDevices and
hard-wire the keyboard RawInputDevice info in here.

[CJ, 2017/01/07 00:12:36]

Left in function to make the keyboard RawInputDevice (removing type and mouse
related code), but done.

[Wez, 2017/01/09 22:38:43]

Acknowledged.

   if (!RegisterRawInputDevices(device.get(), 1, sizeof(*device))) {
@@ -211,9 +201,6 @@ LRESULT UserInputMonitorWinCore::OnInput(HRAWINPUT input_handle) {
       position.x = 0;
       position.y = 0;
     }
-    mouse_listeners_->Notify(
-        FROM_HERE, &UserInputMonitor::MouseEventListener::OnMouseMoved,
-        SkIPoint::Make(position.x, position.y));
   } else if (input->header.dwType == RIM_TYPEKEYBOARD &&
              input->header.hDevice != NULL) {
     ui::EventType event = (input->data.keyboard.Flags & RI_KEY_BREAK)
@@ -251,7 +238,6 @@ RAWINPUTDEVICE* UserInputMonitorWinCore::GetRawInputDevices(EventBitMask event,
   if (event == MOUSE_EVENT_MASK) {
     device->dwFlags = flags;
     device->usUsagePage = kGenericDesktopPage;
-    device->usUsage = kMouseUsage;
     device->hwndTarget = window_->hwnd();
   } else {
     DCHECK_EQ(KEYBOARD_EVENT_MASK, event);
@@ -270,7 +256,7 @@ RAWINPUTDEVICE* UserInputMonitorWinCore::GetRawInputDevices(EventBitMask event,
 UserInputMonitorWin::UserInputMonitorWin(
     const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
     : ui_task_runner_(ui_task_runner),
-      core_(new UserInputMonitorWinCore(ui_task_runner, mouse_listeners())) {}
+      core_(new UserInputMonitorWinCore(ui_task_runner)) {}
 
 UserInputMonitorWin::~UserInputMonitorWin() {
   if (!ui_task_runner_->DeleteSoon(FROM_HERE, core_))
@@ -297,22 +283,6 @@ void UserInputMonitorWin::StopKeyboardMonitoring() {
                  UserInputMonitorWinCore::KEYBOARD_EVENT_MASK));
 }
 
-void UserInputMonitorWin::StartMouseMonitoring() {
-  ui_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&UserInputMonitorWinCore::StartMonitor,
-                 core_->AsWeakPtr(),
-                 UserInputMonitorWinCore::MOUSE_EVENT_MASK));
-}
-
-void UserInputMonitorWin::StopMouseMonitoring() {
-  ui_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&UserInputMonitorWinCore::StopMonitor,
-                 core_->AsWeakPtr(),
-                 UserInputMonitorWinCore::MOUSE_EVENT_MASK));
-}
-
 }  // namespace
 
 std::unique_ptr<UserInputMonitor> UserInputMonitor::Create(