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

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

Issue 514493004: Revert of Adding Select Action Bar Unit test case for input (patchset #3 of https://codereview.chro… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: copying Created 6 years, 4 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_device_manager.h ('k') | extensions/shell/app_shell.gyp » ('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 1356add6aed4e860b3c0406325cb7196ca468253..4992f05d595d28f48ee4533a94e46c097f82973f 100644
--- a/extensions/browser/api/hid/hid_device_manager.cc
+++ b/extensions/browser/api/hid/hid_device_manager.cc
@@ -8,8 +8,8 @@
#include <vector>
#include "base/lazy_instance.h"
-#include "content/public/browser/browser_thread.h"
#include "device/hid/hid_service.h"
+#include "extensions/browser/api/extensions_api_client.h"
using device::HidService;
using device::HidUsageAndPage;
@@ -17,10 +17,7 @@ using device::HidUsageAndPage;
namespace extensions {
HidDeviceManager::HidDeviceManager(content::BrowserContext* context)
- : next_resource_id_(0),
- ui_message_loop_(content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::UI)) {
-}
+ : next_resource_id_(0) {}
HidDeviceManager::~HidDeviceManager() {}
@@ -37,7 +34,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices(
uint16_t product_id) {
UpdateDevices();
- HidService* hid_service = HidService::GetInstance(ui_message_loop_);
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
base::ListValue* api_devices = new base::ListValue();
for (ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -100,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(ui_message_loop_);
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -113,7 +110,7 @@ bool HidDeviceManager::GetDeviceInfo(int resource_id,
void HidDeviceManager::UpdateDevices() {
thread_checker_.CalledOnValidThread();
- HidService* hid_service = HidService::GetInstance(ui_message_loop_);
+ HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
DCHECK(hid_service);
std::vector<device::HidDeviceInfo> devices;
« no previous file with comments | « extensions/browser/api/hid/hid_device_manager.h ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698