Merge Disable Keyboard in Maximize Mode

ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.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 "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 
 #include <set>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/events/devices/input_device.h"
+#include "ui/events/devices/keyboard_device.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ash {
 
 namespace {
 
 // The name of the xinput device corresponding to the internal touchpad.
 const char kInternalTouchpadName[] = "Elan Touchpad";
 
-// The name of the xinput device corresponding to the internal keyboard.
-const char kInternalKeyboardName[] = "AT Translated Set 2 keyboard";
-
 // Repeated key events have their source set to the core keyboard device.
 // These must be disabled also until http://crbug.com/402898 is resolved.
 const char kCoreKeyboardName[] = "Virtual core keyboard";
 
 // Device id used to indicate that a device has not been detected.
 const int kDeviceIdNone = -1;
 
 gfx::Point GetMouseLocationInScreen() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
@@ skipping 29 matching lines @@
     XIDeviceList xi_dev_list = ui::DeviceListCacheX11::GetInstance()->
         GetXI2DeviceList(gfx::GetXDisplay());
     for (int i = 0; i < xi_dev_list.count; ++i) {
       std::string device_name(xi_dev_list[i].name);
       base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING, &device_name);
       if (device_name == kInternalTouchpadName) {
         touchpad_device_id_ = xi_dev_list[i].deviceid;
         device_data_manager->DisableDevice(touchpad_device_id_);
         aura::client::GetCursorClient(
             Shell::GetInstance()->GetPrimaryRootWindow())->HideCursor();
-      } else if (device_name == kInternalKeyboardName) {
-        keyboard_device_id_ = xi_dev_list[i].deviceid;
-        device_data_manager->DisableDevice(keyboard_device_id_);
       } else if (device_name == kCoreKeyboardName) {
         core_keyboard_device_id_ = xi_dev_list[i].deviceid;
         device_data_manager->DisableDevice(core_keyboard_device_id_);
       }
     }
+
+    for (const ui::KeyboardDevice& device :
+         device_data_manager->keyboard_devices()) {
+      if (device.type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) {
+        keyboard_device_id_ = device.id;
+        device_data_manager->DisableDevice(keyboard_device_id_);
+        break;
+      }
+    }
   }
   // Allow the accessible keys present on the side of some devices to continue
   // working.
   scoped_ptr<std::set<ui::KeyboardCode> > excepted_keys(
       new std::set<ui::KeyboardCode>);
   excepted_keys->insert(ui::VKEY_VOLUME_DOWN);
   excepted_keys->insert(ui::VKEY_VOLUME_UP);
   excepted_keys->insert(ui::VKEY_POWER);
   device_data_manager->SetDisabledKeyboardAllowedKeys(excepted_keys.Pass());
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
@@ skipping 39 matching lines @@
     // blocked. Move the mouse cursor back to its last known location resulting
     // from an external mouse to prevent the internal touchpad from moving it.
     SetMouseLocationInScreen(last_mouse_location_);
   } else {
     // Track the last location seen from an external mouse event.
     last_mouse_location_ = GetMouseLocationInScreen();
   }
 }
 
 }  // namespace ash