Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: extensions/browser/api/hid/hid_device_manager.cc

Issue 419713002: Support permission_broker for chrome.hid devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix hid in app_shell after its move to //extensions Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/api/hid/hid_api.cc ('k') | extensions/common/api/_api_features.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/hid/hid_device_manager.cc
diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
index c14783c790c39b15eafee8dd51a6f7bc0f7744ce..4992f05d595d28f48ee4533a94e46c097f82973f 100644
--- a/extensions/browser/api/hid/hid_device_manager.cc
+++ b/extensions/browser/api/hid/hid_device_manager.cc
@@ -9,6 +9,7 @@
#include "base/lazy_instance.h"
#include "device/hid/hid_service.h"
+#include "extensions/browser/api/extensions_api_client.h"
using device::HidService;
using device::HidUsageAndPage;
@@ -33,7 +34,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices(
uint16_t product_id) {
UpdateDevices();
- HidService* hid_service = HidService::GetInstance();
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
base::ListValue* api_devices = new base::ListValue();
for (ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -96,7 +97,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices(
bool HidDeviceManager::GetDeviceInfo(int resource_id,
device::HidDeviceInfo* device_info) {
UpdateDevices();
- HidService* hid_service = HidService::GetInstance();
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -109,7 +110,7 @@ bool HidDeviceManager::GetDeviceInfo(int resource_id,
void HidDeviceManager::UpdateDevices() {
thread_checker_.CalledOnValidThread();
- HidService* hid_service = HidService::GetInstance();
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
std::vector<device::HidDeviceInfo> devices;
« no previous file with comments | « extensions/browser/api/hid/hid_api.cc ('k') | extensions/common/api/_api_features.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698