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

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

Issue 1115213004: Add chrome.hid.getUserSelectedDevices API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
Index: extensions/browser/api/hid/hid_device_manager.h
diff --git a/extensions/browser/api/hid/hid_device_manager.h b/extensions/browser/api/hid/hid_device_manager.h
index d39eccdac455a05285db52758d6c90e0d8dfac07..155ba567fcd8b968942270584cc847f37eac0f86 100644
--- a/extensions/browser/api/hid/hid_device_manager.h
+++ b/extensions/browser/api/hid/hid_device_manager.h
@@ -13,7 +13,6 @@
#include "base/memory/scoped_vector.h"
#include "base/scoped_observer.h"
#include "base/threading/thread_checker.h"
-#include "device/hid/hid_device_info.h"
#include "device/hid/hid_service.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "extensions/browser/event_router.h"
@@ -21,6 +20,7 @@
namespace device {
class HidDeviceFilter;
+class HidDeviceInfo;
}
namespace extensions {
@@ -55,10 +55,16 @@ class HidDeviceManager : public BrowserContextKeyedAPI,
const std::vector<device::HidDeviceFilter>& filters,
const GetApiDevicesCallback& callback);
+ // Converts a list of HidDeviceInfo objects into a value that can be returned
+ // through the API.
+ scoped_ptr<base::ListValue> GetApiDevicesFromList(
+ const std::vector<scoped_refptr<device::HidDeviceInfo>>& devices);
+
scoped_refptr<device::HidDeviceInfo> GetDeviceInfo(int resource_id);
- static bool HasPermission(const Extension* extension,
- scoped_refptr<device::HidDeviceInfo> device_info);
+ bool HasPermission(const Extension* extension,
+ scoped_refptr<device::HidDeviceInfo> device_info,
+ bool update_last_used);
private:
friend class BrowserContextKeyedAPIFactory<HidDeviceManager>;
@@ -103,13 +109,14 @@ class HidDeviceManager : public BrowserContextKeyedAPI,
scoped_refptr<device::HidDeviceInfo> device_info);
base::ThreadChecker thread_checker_;
+ content::BrowserContext* browser_context_;
EventRouter* event_router_;
- bool initialized_;
+ bool initialized_ = false;
Devlin 2015/05/05 22:19:50 please be consistent - if certain variables are go
Reilly Grant (use Gerrit) 2015/05/06 00:52:53 Done.
ScopedObserver<device::HidService, device::HidService::Observer>
hid_service_observer_;
- bool enumeration_ready_;
+ bool enumeration_ready_ = false;
ScopedVector<GetApiDevicesParams> pending_enumerations_;
- int next_resource_id_;
+ int next_resource_id_ = 0;
ResourceIdToDeviceIdMap device_ids_;
DeviceIdToResourceIdMap resource_ids_;
base::WeakPtrFactory<HidDeviceManager> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698