Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / api / hid / hid_device_manager.h

diff --git a/src/extensions/browser/api/hid/hid_device_manager.h b/src/extensions/browser/api/hid/hid_device_manager.h
index de94960..7edfd23 100644 (file)
--- a/src/extensions/browser/api/hid/hid_device_manager.h
+++ b/src/extensions/browser/api/hid/hid_device_manager.h
@@ -10,14 +10,21 @@
 #include <map>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "device/hid/hid_device_info.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/common/api/hid.h"
 
+namespace device {
+class HidDeviceFilter;
+}
+
 namespace extensions {
 
+class Extension;
+
 class HidDeviceManager : public BrowserContextKeyedAPI {
  public:
   explicit HidDeviceManager(content::BrowserContext* context);
@@ -31,20 +38,23 @@ class HidDeviceManager : public BrowserContextKeyedAPI {
     return BrowserContextKeyedAPIFactory<HidDeviceManager>::Get(context);
   }
 
-  scoped_ptr<base::ListValue> GetApiDevices(uint16_t vendor_id,
-                                            uint16_t product_id);
+  scoped_ptr<base::ListValue> GetApiDevices(
+      const Extension* extension,
+      const std::vector<device::HidDeviceFilter>& filters);
 
   bool GetDeviceInfo(int resource_id, device::HidDeviceInfo* device_info);
 
+  bool HasPermission(const Extension* extension,
+                     const device::HidDeviceInfo& device_info);
+
  private:
   friend class BrowserContextKeyedAPIFactory<HidDeviceManager>;
 
   static const char* service_name() { return "HidDeviceManager"; }
+  static bool IsCalledOnValidThread();
 
   void UpdateDevices();
 
-  base::ThreadChecker thread_checker_;
-
   int next_resource_id_;
 
   typedef std::map<int, device::HidDeviceId> ResourceIdToDeviceIdMap;