diff options
Diffstat (limited to 'extensions/browser/api/hid/hid_device_manager.cc')
-rw-r--r-- | extensions/browser/api/hid/hid_device_manager.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc index b57e2d9..1c25025 100644 --- a/extensions/browser/api/hid/hid_device_manager.cc +++ b/extensions/browser/api/hid/hid_device_manager.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/lazy_instance.h" +#include "device/core/device_client.h" #include "device/hid/hid_device_filter.h" #include "device/hid/hid_service.h" #include "extensions/browser/api/extensions_api_client.h" @@ -21,7 +22,8 @@ using device::HidUsageAndPage; namespace extensions { HidDeviceManager::HidDeviceManager(content::BrowserContext* context) - : next_resource_id_(0) {} + : next_resource_id_(0) { +} HidDeviceManager::~HidDeviceManager() {} @@ -38,7 +40,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices( const std::vector<HidDeviceFilter>& filters) { UpdateDevices(); - HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService(); + HidService* hid_service = device::DeviceClient::Get()->GetHidService(); DCHECK(hid_service); base::ListValue* api_devices = new base::ListValue(); for (ResourceIdToDeviceIdMap::const_iterator device_iter = @@ -106,7 +108,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices( bool HidDeviceManager::GetDeviceInfo(int resource_id, device::HidDeviceInfo* device_info) { UpdateDevices(); - HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService(); + HidService* hid_service = device::DeviceClient::Get()->GetHidService(); DCHECK(hid_service); ResourceIdToDeviceIdMap::const_iterator device_iter = @@ -142,7 +144,7 @@ bool HidDeviceManager::HasPermission(const Extension* extension, void HidDeviceManager::UpdateDevices() { thread_checker_.CalledOnValidThread(); - HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService(); + HidService* hid_service = device::DeviceClient::Get()->GetHidService(); DCHECK(hid_service); std::vector<device::HidDeviceInfo> devices; |