HID fix for device info check.

chrome/browser/ui/webui/chromeos/login/hid_detection_screen_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 "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 11 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.HIDDetectionScreen";
 
 // Variants of pairing state.
 const char kRemotePinCode[] = "bluetoothRemotePinCode";
 const char kRemotePasskey[] = "bluetoothRemotePasskey";
 
-// Possible ui-states for device-blocks.
+// Possible ui-states for device-blocks. Same as CONNECTION dict of
+// HIDDetectionScreen
 const char kSearchingState[] = "searching";
 const char kUSBConnectedState[] = "connected";
 const char kBTPairedState[] = "paired";
 const char kBTPairingState[] = "pairing";
-// Special state for notifications that don't switch ui-state, but add info.
+// Special state for notifications that doesn't switch ui-state, but adds info.
 const char kBTUpdateState[] = "update";
 
 // Names of possible arguments used for ui update.
 const char kPincodeArgName[] = "pincode";
 const char kDeviceNameArgName[] = "name";
 const char kLabelArgName[] = "keyboard-label";
 
 // Standard length of pincode for pairing BT keyboards.
 const int kPincodeLength = 6;
 
 bool DeviceIsPointing(device::BluetoothDevice::DeviceType device_type) {
   return device_type == device::BluetoothDevice::DEVICE_MOUSE ||
          device_type == device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO ||
          device_type == device::BluetoothDevice::DEVICE_TABLET;
 }
 
 bool DeviceIsPointing(const device::InputServiceLinux::InputDeviceInfo& info) {
   return info.is_mouse || info.is_touchpad || info.is_touchscreen ||
          info.is_tablet;
 }
 
 bool DeviceIsKeyboard(device::BluetoothDevice::DeviceType device_type) {
   return device_type == device::BluetoothDevice::DEVICE_KEYBOARD ||
          device_type == device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO;
 }
 
+bool DeviceIsKeyboard(const device::InputServiceLinux::InputDeviceInfo& info) {
+  return info.is_keyboard || info.is_touchscreen || info.is_tablet;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 HIDDetectionScreenHandler::HIDDetectionScreenHandler(
     CoreOobeActor* core_oobe_actor)
     : BaseScreenHandler(kJsScreenPath),
       delegate_(NULL),
       core_oobe_actor_(core_oobe_actor),
       show_on_init_(false),
@@ skipping 42 matching lines @@
   input_service_proxy_.AddObserver(this);
   UpdateDevices();
 
   PrefService* local_state = g_browser_process->local_state();
   int num_of_times_dialog_was_shown = local_state->GetInteger(
       prefs::kTimesHIDDialogShown);
   local_state->SetInteger(prefs::kTimesHIDDialogShown,
                           num_of_times_dialog_was_shown + 1);
 
   ShowScreen(OobeUI::kScreenHIDDetection, NULL);
-  if (!pointing_device_id_.empty())
-    SendPointingDeviceNotification();
-  if (!keyboard_device_id_.empty())
-    SendKeyboardDeviceNotification(NULL);
+  SendPointingDeviceNotification();
+  SendKeyboardDeviceNotification(NULL);
 }
 
 void HIDDetectionScreenHandler::Hide() {
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   input_service_proxy_.RemoveObserver(this);
 }
 
 void HIDDetectionScreenHandler::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
@@ skipping 222 matching lines @@
   // TODO(merkulova): deal with all available device types, e.g. joystick.
   if (!keyboard_device_id_.empty() && !pointing_device_id_.empty())
     return;
 
   if (pointing_device_id_.empty() && DeviceIsPointing(info)) {
     pointing_device_id_ = info.id;
     pointing_device_name_ = info.name;
     pointing_device_connect_type_ = info.type;
     SendPointingDeviceNotification();
   }
-  if (keyboard_device_id_.empty() && info.is_keyboard) {
+  if (keyboard_device_id_.empty() && DeviceIsKeyboard(info)) {
     keyboard_device_id_ = info.id;
     keyboard_device_name_ = info.name;
     keyboard_device_connect_type_ = info.type;
     SendKeyboardDeviceNotification(NULL);
   }
 }
 
 void HIDDetectionScreenHandler::OnInputDeviceRemoved(const std::string& id) {
   if (id == keyboard_device_id_) {
     keyboard_device_id_.clear();
@@ skipping 198 matching lines @@
         l10n_util::GetStringFUTF16(
             IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD,
             base::UTF8ToUTF16(keyboard_device_name_)));
   } else {
     state_info.SetString("state", kUSBConnectedState);
   }
   CallJS("setKeyboardDeviceState", state_info);
 }
 
 }  // namespace chromeos