Merge Disable Keyboard in Maximize Mode

ui/events/platform/x11/x11_hotplug_event_handler.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/platform/x11/x11_hotplug_event_handler.h"
 
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
@@ skipping 23 matching lines @@
 
 namespace ui {
 
 namespace {
 
 // Names of all known internal devices that should not be considered as
 // keyboards.
 // TODO(rsadam@): Identify these devices using udev rules. (Crbug.com/420728.)
 const char* kKnownInvalidKeyboardDeviceNames[] = {"Power Button",
                                                   "Sleep Button",
-                                                  "Video Bus"};
+                                                  "Video Bus",
+                                                  "gpio-keys.12",
+                                                  "ROCKCHIP-I2S Headset Jack"};
 
 const char* kCachedAtomList[] = {
   "Abs MT Position X",
   "Abs MT Position Y",
   NULL,
 };
 
 typedef base::Callback<void(const std::vector<KeyboardDevice>&)>
     KeyboardDeviceCallback;
 
@@ skipping 293 matching lines @@
   base::WorkerPool::PostTask(FROM_HERE,
                              base::Bind(&HandleHotplugEventInWorker,
                                         device_infos,
                                         display_state,
                                         base::ThreadTaskRunnerHandle::Get(),
                                         callbacks),
                              true /* task_is_slow */);
 }
 
 }  // namespace ui