Move enum BluetoothDevice::DeviceType out of BluetoothDevice class.

chrome/browser/chromeos/login/screens/hid_detection_screen.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/chromeos/login/screens/hid_detection_screen.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 11 matching lines @@
 // Possible ui-states for device-blocks.
 const char kSearchingState[] = "searching";
 const char kUSBState[] = "usb";
 const char kConnectedState[] = "connected";
 const char kBTPairedState[] = "paired";
 const char kBTPairingState[] = "pairing";
 
 // 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(device::BluetoothDeviceType device_type) {
+  return device_type == device::BluetoothDeviceType::MOUSE ||
+         device_type == device::BluetoothDeviceType::KEYBOARD_MOUSE_COMBO ||
+         device_type == device::BluetoothDeviceType::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(device::BluetoothDeviceType device_type) {
+  return device_type == device::BluetoothDeviceType::KEYBOARD ||
+         device_type == device::BluetoothDeviceType::KEYBOARD_MOUSE_COMBO;
 }
 
 }  // namespace
 
 namespace chromeos {
 
 HIDDetectionScreen::HIDDetectionScreen(BaseScreenDelegate* base_screen_delegate,
                                        HIDDetectionView* view)
     : HIDDetectionModel(base_screen_delegate),
       view_(view),
@@ skipping 195 matching lines @@
       !keyboard_is_pairing_) {
     ConnectBTDevice(device);
   }
 }
 
 void HIDDetectionScreen::ConnectBTDevice(device::BluetoothDevice* device) {
   bool device_busy = (device->IsConnected() && device->IsPaired()) ||
                       device->IsConnecting();
   if (!device->IsPairable() || device_busy)
     return;
-  device::BluetoothDevice::DeviceType device_type = device->GetDeviceType();
+  device::BluetoothDeviceType device_type = device->GetDeviceType();
 
-  if (device_type == device::BluetoothDevice::DEVICE_MOUSE ||
-      device_type == device::BluetoothDevice::DEVICE_TABLET) {
+  if (device_type == device::BluetoothDeviceType::MOUSE ||
+      device_type == device::BluetoothDeviceType::TABLET) {
     if (mouse_is_pairing_)
       return;
     mouse_is_pairing_ = true;
-  } else if (device_type == device::BluetoothDevice::DEVICE_KEYBOARD) {
+  } else if (device_type == device::BluetoothDeviceType::KEYBOARD) {
     if (keyboard_is_pairing_)
       return;
     keyboard_is_pairing_ = true;
-  } else if (device_type ==
-      device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO) {
+  } else if (device_type == device::BluetoothDeviceType::KEYBOARD_MOUSE_COMBO) {
     if (mouse_is_pairing_ && keyboard_is_pairing_)
       return;
     mouse_is_pairing_ = true;
     keyboard_is_pairing_ = true;
   }
   device->Connect(this,
             base::Bind(&HIDDetectionScreen::BTConnected,
                        weak_ptr_factory_.GetWeakPtr(), device_type),
             base::Bind(&HIDDetectionScreen::BTConnectError,
                        weak_ptr_factory_.GetWeakPtr(),
                        device->GetAddress(), device_type));
 }
 
-void HIDDetectionScreen::BTConnected(
-    device::BluetoothDevice::DeviceType device_type) {
+void HIDDetectionScreen::BTConnected(device::BluetoothDeviceType device_type) {
   if (DeviceIsPointing(device_type))
     mouse_is_pairing_ = false;
   if (DeviceIsKeyboard(device_type)) {
     keyboard_is_pairing_ = false;
     GetContextEditor()
         .SetBoolean(kContextKeyNumKeysEnteredExpected, false)
         .SetString(kContextKeyPinCode, "");
     SendKeyboardDeviceNotification();
   }
 }
 
 void HIDDetectionScreen::BTConnectError(
     const std::string& address,
-    device::BluetoothDevice::DeviceType device_type,
+    device::BluetoothDeviceType device_type,
     device::BluetoothDevice::ConnectErrorCode error_code) {
   LOG(WARNING) << "BTConnectError while connecting " << address
                << " error code = " << error_code;
   if (DeviceIsPointing(device_type))
     mouse_is_pairing_ = false;
   if (DeviceIsKeyboard(device_type)) {
     keyboard_is_pairing_ = false;
     GetContextEditor()
         .SetInteger(kContextKeyNumKeysEnteredExpected, false)
         .SetString(kContextKeyPinCode, "");
@@ skipping 233 matching lines @@
 void HIDDetectionScreen::SetPoweredOffError() {
   LOG(ERROR) << "Failed to power off BT adapter";
 }
 
 void HIDDetectionScreen::FindDevicesError() {
   VLOG(1) << "Failed to start Bluetooth discovery.";
 }
 
 
 }  // namespace chromeos