Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / options / chromeos / internet_options_handler.h

diff --git a/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
index f209b64..63eac6f 100644 (file)
--- a/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
+++ b/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
@@ -44,30 +44,29 @@ class InternetOptionsHandler
  private:
   // OptionsPageUIHandler
   virtual void GetLocalizedValues(
-      base::DictionaryValue* localized_strings) OVERRIDE;
-  virtual void InitializePage() OVERRIDE;
+      base::DictionaryValue* localized_strings) override;
+  virtual void InitializePage() override;
 
   // WebUIMessageHandler (from OptionsPageUIHandler)
-  virtual void RegisterMessages() OVERRIDE;
+  virtual void RegisterMessages() override;
 
   // Callbacks to set network state properties.
-  void EnableWifiCallback(const base::ListValue* args);
-  void DisableWifiCallback(const base::ListValue* args);
-  void EnableCellularCallback(const base::ListValue* args);
-  void DisableCellularCallback(const base::ListValue* args);
-  void EnableWimaxCallback(const base::ListValue* args);
-  void DisableWimaxCallback(const base::ListValue* args);
   void ShowMorePlanInfoCallback(const base::ListValue* args);
-  void BuyDataPlanCallback(const base::ListValue* args);
   void SetApnCallback(const base::ListValue* args);
   void SetApnProperties(const base::ListValue* args,
                         const std::string& service_path,
                         const base::DictionaryValue& shill_properties);
   void CarrierStatusCallback();
   void SetCarrierCallback(const base::ListValue* args);
-  void SetSimCardLockCallback(const base::ListValue* args);
-  void ChangePinCallback(const base::ListValue* args);
-  void RefreshNetworksCallback(const base::ListValue* args);
+  void SimOperationCallback(const base::ListValue* args);
+
+  // networkingPrvate callbacks
+  void DisableNetworkTypeCallback(const base::ListValue* args);
+  void EnableNetworkTypeCallback(const base::ListValue* args);
+  void GetManagedPropertiesCallback(const base::ListValue* args);
+  void RequestNetworkScanCallback(const base::ListValue* args);
+  void StartConnectCallback(const base::ListValue* args);
+  void StartDisconnectCallback(const base::ListValue* args);
 
   // Retrieves a data url for a resource.
   std::string GetIconDataUrl(int resource_id) const;
@@ -78,21 +77,25 @@ class InternetOptionsHandler
   // Updates the display of network connection information for the details page
   // if visible.
   void UpdateConnectionData(const std::string& service_path);
-  void UpdateConnectionDataCallback(
-      const std::string& service_path,
-      const base::DictionaryValue& shill_properties);
+
+  // Callback for ManagedNetworkConnectionHandler::GetManagedProperties.
+  // Calls the JS callback |js_callback_function| with the result.
+  void GetManagedPropertiesResult(const std::string& js_callback_function,
+                                  const std::string& service_path,
+                                  const base::DictionaryValue& onc_properties);
+
   // Called when carrier data has been updated to informs the JS.
   void UpdateCarrier();
 
   // NetworkStateHandlerObserver
-  virtual void DeviceListChanged() OVERRIDE;
-  virtual void NetworkListChanged() OVERRIDE;
+  virtual void DeviceListChanged() override;
+  virtual void NetworkListChanged() override;
   virtual void NetworkConnectionStateChanged(
-      const chromeos::NetworkState* network) OVERRIDE;
+      const chromeos::NetworkState* network) override;
   virtual void NetworkPropertiesUpdated(
-      const chromeos::NetworkState* network) OVERRIDE;
+      const chromeos::NetworkState* network) override;
   virtual void DevicePropertiesUpdated(
-      const chromeos::DeviceState* device) OVERRIDE;
+      const chromeos::DeviceState* device) override;
 
   // Updates the logged in user type.
   void UpdateLoggedInUserType();
@@ -106,12 +109,6 @@ class InternetOptionsHandler
                              const std::string& service_path,
                              const base::DictionaryValue& shill_properties);
 
-  // Retrieves the properties for |service_path| and calls showDetailedInfo
-  // with the results.
-  void PopulateDictionaryDetailsCallback(
-      const std::string& service_path,
-      const base::DictionaryValue& shill_properties);
-
   // Gets the native window for hosting dialogs, etc.
   gfx::NativeWindow GetNativeWindow() const;
 
@@ -121,14 +118,11 @@ class InternetOptionsHandler
   // Gets the user PrefService associated with the WebUI.
   const PrefService* GetPrefs() const;
 
-  // Handle various network commands and clicks on a network item
-  // in the network list.
-  // |args| must be { network_type, service_path, command } with 'command'
-  // one of: [ add, forget, options, connect disconnect, activate ]
-  void NetworkCommandCallback(const base::ListValue* args);
-
-  // Helper functions called by NetworkCommandCallback(...)
-  void AddConnection(const std::string& type);
+  // Additional callbacks for managing networks.
+  void AddConnection(const base::ListValue* args);
+  void ConfigureNetwork(const base::ListValue* args);
+  void ActivateNetwork(const base::ListValue* args);
+  void RemoveNetwork(const base::ListValue* args);
 
   // Creates the map of wired networks.
   base::ListValue* GetWiredList();