Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / networking_private / networking_private_service_client.h

diff --git a/src/chrome/browser/extensions/api/networking_private/networking_private_service_client.h b/src/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
index 63708c5..4253b14 100644 (file)
--- a/src/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
+++ b/src/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
@@ -112,71 +112,66 @@ class NetworkingPrivateServiceClient
                                  CryptoVerify* crypto_verify);
 
   // KeyedService
-  virtual void Shutdown() OVERRIDE;
+  void Shutdown() override;
 
   // NetworkingPrivateDelegate
-  virtual void GetProperties(const std::string& guid,
-                             const DictionaryCallback& success_callback,
-                             const FailureCallback& failure_callback) OVERRIDE;
-  virtual void GetManagedProperties(
-      const std::string& guid,
-      const DictionaryCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void GetState(const std::string& guid,
-                        const DictionaryCallback& success_callback,
-                        const FailureCallback& failure_callback) OVERRIDE;
-  virtual void SetProperties(const std::string& guid,
-                             scoped_ptr<base::DictionaryValue> properties_dict,
-                             const VoidCallback& success_callback,
-                             const FailureCallback& failure_callback) OVERRIDE;
-  virtual void CreateNetwork(bool shared,
-                             scoped_ptr<base::DictionaryValue> properties_dict,
-                             const StringCallback& success_callback,
-                             const FailureCallback& failure_callback) OVERRIDE;
-  virtual void GetNetworks(const std::string& network_type,
-                           bool configured_only,
-                           bool visible_only,
-                           int limit,
-                           const NetworkListCallback& success_callback,
-                           const FailureCallback& failure_callback) OVERRIDE;
-  virtual void StartConnect(const std::string& guid,
-                            const VoidCallback& success_callback,
-                            const FailureCallback& failure_callback) OVERRIDE;
-  virtual void StartDisconnect(
-      const std::string& guid,
-      const VoidCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void VerifyDestination(
-      const VerificationProperties& verification_properties,
-      const BoolCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void VerifyAndEncryptCredentials(
+  void GetProperties(const std::string& guid,
+                     const DictionaryCallback& success_callback,
+                     const FailureCallback& failure_callback) override;
+  void GetManagedProperties(const std::string& guid,
+                            const DictionaryCallback& success_callback,
+                            const FailureCallback& failure_callback) override;
+  void GetState(const std::string& guid,
+                const DictionaryCallback& success_callback,
+                const FailureCallback& failure_callback) override;
+  void SetProperties(const std::string& guid,
+                     scoped_ptr<base::DictionaryValue> properties_dict,
+                     const VoidCallback& success_callback,
+                     const FailureCallback& failure_callback) override;
+  void CreateNetwork(bool shared,
+                     scoped_ptr<base::DictionaryValue> properties_dict,
+                     const StringCallback& success_callback,
+                     const FailureCallback& failure_callback) override;
+  void GetNetworks(const std::string& network_type,
+                   bool configured_only,
+                   bool visible_only,
+                   int limit,
+                   const NetworkListCallback& success_callback,
+                   const FailureCallback& failure_callback) override;
+  void StartConnect(const std::string& guid,
+                    const VoidCallback& success_callback,
+                    const FailureCallback& failure_callback) override;
+  void StartDisconnect(const std::string& guid,
+                       const VoidCallback& success_callback,
+                       const FailureCallback& failure_callback) override;
+  void VerifyDestination(const VerificationProperties& verification_properties,
+                         const BoolCallback& success_callback,
+                         const FailureCallback& failure_callback) override;
+  void VerifyAndEncryptCredentials(
       const std::string& guid,
       const VerificationProperties& verification_properties,
       const StringCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void VerifyAndEncryptData(
+      const FailureCallback& failure_callback) override;
+  void VerifyAndEncryptData(
       const VerificationProperties& verification_properties,
       const std::string& data,
       const StringCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void SetWifiTDLSEnabledState(
+      const FailureCallback& failure_callback) override;
+  void SetWifiTDLSEnabledState(
       const std::string& ip_or_mac_address,
       bool enabled,
       const StringCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void GetWifiTDLSStatus(
-      const std::string& ip_or_mac_address,
-      const StringCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual void GetCaptivePortalStatus(
-      const std::string& guid,
-      const StringCallback& success_callback,
-      const FailureCallback& failure_callback) OVERRIDE;
-  virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() OVERRIDE;
-  virtual bool EnableNetworkType(const std::string& type) OVERRIDE;
-  virtual bool DisableNetworkType(const std::string& type) OVERRIDE;
-  virtual bool RequestScan() OVERRIDE;
+      const FailureCallback& failure_callback) override;
+  void GetWifiTDLSStatus(const std::string& ip_or_mac_address,
+                         const StringCallback& success_callback,
+                         const FailureCallback& failure_callback) override;
+  void GetCaptivePortalStatus(const std::string& guid,
+                              const StringCallback& success_callback,
+                              const FailureCallback& failure_callback) override;
+  scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override;
+  bool EnableNetworkType(const std::string& type) override;
+  bool DisableNetworkType(const std::string& type) override;
+  bool RequestScan() override;
 
   // Adds observer to network events.
   void AddObserver(Observer* network_events_observer);
@@ -186,8 +181,8 @@ class NetworkingPrivateServiceClient
   void RemoveObserver(Observer* network_events_observer);
 
   // NetworkChangeNotifier::NetworkChangeObserver implementation.
-  virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+  void OnNetworkChanged(
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
  private:
   // Callbacks to extension api function objects. Keep reference to API object
@@ -214,7 +209,7 @@ class NetworkingPrivateServiceClient
   };
   typedef IDMap<ServiceCallbacks, IDMapOwnPointer> ServiceCallbacksMap;
 
-  virtual ~NetworkingPrivateServiceClient();
+  ~NetworkingPrivateServiceClient() override;
 
   // Callback wrappers.
   void AfterGetProperties(ServiceCallbacksID callback_id,