Update To 11.40.268.0

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

diff --git a/src/extensions/browser/api/hid/hid_api.h b/src/extensions/browser/api/hid/hid_api.h
index e8bc26e..cf439af 100644 (file)
--- a/src/extensions/browser/api/hid/hid_api.h
+++ b/src/extensions/browser/api/hid/hid_api.h
@@ -15,6 +15,10 @@
 #include "extensions/browser/api/hid/hid_device_manager.h"
 #include "extensions/common/api/hid.h"
 
+namespace device {
+class HidService;
+}  // namespace device
+
 namespace net {
 class IOBuffer;
 }  // namespace net
@@ -25,11 +29,11 @@ class HidAsyncApiFunction : public AsyncApiFunction {
  public:
   HidAsyncApiFunction();
 
-  virtual bool PrePrepare() OVERRIDE;
-  virtual bool Respond() OVERRIDE;
+  bool PrePrepare() override;
+  bool Respond() override;
 
  protected:
-  virtual ~HidAsyncApiFunction();
+  ~HidAsyncApiFunction() override;
 
   HidConnectionResource* GetHidConnectionResource(int api_resource_id);
   void RemoveHidConnectionResource(int api_resource_id);
@@ -50,10 +54,10 @@ class HidGetDevicesFunction : public HidAsyncApiFunction {
   HidGetDevicesFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
-  virtual ~HidGetDevicesFunction();
+  ~HidGetDevicesFunction() override;
 
   scoped_ptr<core_api::hid::GetDevices::Params> parameters_;
 
@@ -68,11 +72,13 @@ class HidConnectFunction : public HidAsyncApiFunction {
   HidConnectFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidConnectFunction();
+  ~HidConnectFunction() override;
+
+  void OnConnectComplete(scoped_refptr<device::HidConnection> connection);
 
   scoped_ptr<core_api::hid::Connect::Params> parameters_;
 
@@ -86,11 +92,11 @@ class HidDisconnectFunction : public HidAsyncApiFunction {
   HidDisconnectFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidDisconnectFunction();
+  ~HidDisconnectFunction() override;
 
   scoped_ptr<core_api::hid::Disconnect::Params> parameters_;
 
@@ -104,11 +110,11 @@ class HidReceiveFunction : public HidAsyncApiFunction {
   HidReceiveFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidReceiveFunction();
+  ~HidReceiveFunction() override;
 
   void OnFinished(bool success,
                   scoped_refptr<net::IOBuffer> buffer,
@@ -126,11 +132,11 @@ class HidSendFunction : public HidAsyncApiFunction {
   HidSendFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidSendFunction();
+  ~HidSendFunction() override;
 
   void OnFinished(bool success);
 
@@ -147,11 +153,11 @@ class HidReceiveFeatureReportFunction : public HidAsyncApiFunction {
   HidReceiveFeatureReportFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidReceiveFeatureReportFunction();
+  ~HidReceiveFeatureReportFunction() override;
 
   void OnFinished(bool success,
                   scoped_refptr<net::IOBuffer> buffer,
@@ -169,11 +175,11 @@ class HidSendFeatureReportFunction : public HidAsyncApiFunction {
   HidSendFeatureReportFunction();
 
  protected:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
-  virtual ~HidSendFeatureReportFunction();
+  ~HidSendFeatureReportFunction() override;
 
   void OnFinished(bool success);