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

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

Issue 523743005: Fix HidService lifetime issues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: where did that stupid line come from Created 6 years, 3 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 b57e2d91a5fb0e111dd651a3cd30f7caf2f5019f..1c2502591e46867cfcdc047dbfd6173bc9b3a361 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;
« 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