Adds special support to the device manager for keyboards devices.

ui/events/device_data_manager.cc

 // 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/events/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/events/input_device_event_observer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point3_f.h"
 
 namespace ui {
 
+namespace {
+
+bool TouchscreenEquals(const ui::TouchscreenDevice& a,
+    const ui::TouchscreenDevice& b) {
+  return a.id == b.id;
+}
+
+bool KeyboardEquals(const ui::KeyboardDevice& a,
+    const ui::KeyboardDevice& b) {
+  return a.id == b.id;
+}
+
+}  // namespace
+
 // static
 DeviceDataManager* DeviceDataManager::instance_ = NULL;
 
 DeviceDataManager::DeviceDataManager() {
   CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";
   instance_ = this;
 
   base::AtExitManager::RegisterTask(
       base::Bind(&base::DeletePointer<DeviceDataManager>, this));
 
@@ skipping 78 matching lines @@
 }
 
 int64_t DeviceDataManager::GetDisplayForTouchDevice(int touch_device_id) const {
   if (IsTouchDeviceIdValid(touch_device_id))
     return touch_device_to_display_map_[touch_device_id];
   return gfx::Display::kInvalidDisplayID;
 }
 
 void DeviceDataManager::OnTouchscreenDevicesUpdated(
     const std::vector<TouchscreenDevice>& devices) {
-  touchscreen_devices_ = devices;
+  if (devices.size() != touchscreen_devices_.size() ||
+      std::equal(devices.begin(), devices.end(),

[flackr, 2014/10/04 00:35:12]

Did you mean !std::equal(...?

[rsadam, 2014/10/04 18:46:27]

Done.

+      touchscreen_devices_.begin(), TouchscreenEquals)) {

[flackr, 2014/10/04 00:35:12]

nit: indent 4 more (to show it's wrapped from std::equal(...
Or line up with devices.begin() after the '(' above.

[rsadam, 2014/10/04 18:46:27]

Done.

+    touchscreen_devices_ = devices;

[flackr, 2014/10/04 00:35:12]

Better yet, early return if the device list looks the same rather than wrapping
the contents of the function in an if.

[rsadam, 2014/10/04 18:46:27]

Done.

+    FOR_EACH_OBSERVER(InputDeviceEventObserver,
+                    observers_,
+                    OnTouchscreenDeviceConfigurationChanged());
+  }
+}
 
-  FOR_EACH_OBSERVER(InputDeviceEventObserver,
+void DeviceDataManager::OnKeyboardDevicesUpdated(
+    const std::vector<KeyboardDevice>& devices) {
+  if (devices.size() != keyboard_devices_.size() ||
+      std::equal(devices.begin(), devices.end(),

[flackr, 2014/10/04 00:35:12]

ditto, !std::equal?

[rsadam, 2014/10/04 18:46:27]

Done.

+      keyboard_devices_.begin(), KeyboardEquals)) {

[flackr, 2014/10/04 00:35:12]

ditto, indent 4 more or to just past '(' above.

[rsadam, 2014/10/04 18:46:27]

Done.

+    keyboard_devices_ = devices;
+    FOR_EACH_OBSERVER(InputDeviceEventObserver,
                     observers_,
-                    OnInputDeviceConfigurationChanged());
+                    OnKeyboardDeviceConfigurationChanged());
+  }
 }
 
 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui