Add 'setProperties' to InternetOptionsHandler

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 77 matching lines @@
 const char kGetManagedPropertiesResultFunction[] =
     "options.internet.DetailsInternetPage.getManagedPropertiesResult";
 const char kUpdateConnectionDataFunction[] =
     "options.internet.DetailsInternetPage.updateConnectionData";
 const char kUpdateCarrierFunction[] =
     "options.internet.DetailsInternetPage.updateCarrier";
 
 // Setter methods called from JS that still need to be converted to match
 // networkingPrivate methods.
 const char kSetApnMessage[] = "setApn";
-const char kSetAutoConnectMessage[] = "setAutoConnect";
 const char kSetCarrierMessage[] = "setCarrier";
 const char kSetIPConfigMessage[] = "setIPConfig";
-const char kSetPreferNetworkMessage[] = "setPreferNetwork";
-const char kSetServerHostname[] = "setServerHostname";
 const char kShowMorePlanInfoMessage[] = "showMorePlanInfo";
 const char kSimOperationMessage[] = "simOperation";
 
 // TODO(stevenjb): Replace these with the matching networkingPrivate methods.
 // crbug.com/279351.
 const char kDisableNetworkTypeMessage[] = "disableNetworkType";
 const char kEnableNetworkTypeMessage[] = "enableNetworkType";
 const char kGetManagedPropertiesMessage[] = "getManagedProperties";
 const char kRequestNetworkScanMessage[] = "requestNetworkScan";
 const char kStartConnectMessage[] = "startConnect";
 const char kStartDisconnectMessage[] = "startDisconnect";
+const char kSetPropertiesMessage[] = "setProperties";
 
 // TODO(stevenjb): Add these to networkingPrivate.
 const char kRemoveNetworkMessage[] = "removeNetwork";
 
 // TODO(stevenjb): Deprecate these and integrate with settings Web UI.
 const char kAddConnectionMessage[] = "addConnection";
 const char kConfigureNetworkMessage[] = "configureNetwork";
 const char kActivateNetworkMessage[] = "activateNetwork";
 
 // These are strings used to communicate with JavaScript.
@@ skipping 14 matching lines @@
 const char kTagWimaxAvailable[] = "wimaxAvailable";
 const char kTagWimaxEnabled[] = "wimaxEnabled";
 const char kTagWiredList[] = "wiredList";
 const char kTagWirelessList[] = "wirelessList";
 
 // Pseudo-ONC chrome specific properties appended to the ONC dictionary.
 const char kNetworkInfoKeyServicePath[] = "servicePath";
 const char kTagErrorMessage[] = "errorMessage";
 const char kTagShowViewAccountButton[] = "showViewAccountButton";
 
-const int kPreferredPriority = 1;
-
 void ShillError(const std::string& function,
                 const std::string& error_name,
                 scoped_ptr<base::DictionaryValue> error_data) {
   // UpdateConnectionData may send requests for stale services; ignore
   // these errors.
   if (function == "UpdateConnectionData" &&
       error_name == network_handler::kDBusFailedError)
     return;
   NET_LOG_ERROR("Shill Error from InternetOptionsHandler: " + error_name,
                 function);
 }
 
 const NetworkState* GetNetworkState(const std::string& service_path) {
   return NetworkHandler::Get()->network_state_handler()->
       GetNetworkState(service_path);
 }
 
-void SetNetworkProperty(const std::string& service_path,
-                        const std::string& property,
-                        base::Value* value) {
-  NET_LOG_EVENT("SetNetworkProperty: " + property, service_path);
-  base::DictionaryValue properties;
-  properties.SetWithoutPathExpansion(property, value);
-  NetworkHandler::Get()->network_configuration_handler()->SetProperties(
-      service_path, properties,
-      NetworkConfigurationObserver::SOURCE_USER_ACTION,
-      base::Bind(&base::DoNothing),
-      base::Bind(&ShillError, "SetNetworkProperty"));
-}
-
 // Builds a dictionary with network information and an icon used for the
 // NetworkList on the settings page. Ownership of the returned pointer is
 // transferred to the caller.
 base::DictionaryValue* BuildNetworkDictionary(
     const NetworkState* network,
     float icon_scale_factor,
     const PrefService* profile_prefs) {
   scoped_ptr<base::DictionaryValue> network_info =
       network_util::TranslateNetworkStateToONC(network);
 
@@ skipping 144 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kRemoveNetworkMessage,
       base::Bind(&InternetOptionsHandler::RemoveNetwork,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kConfigureNetworkMessage,
       base::Bind(&InternetOptionsHandler::ConfigureNetwork,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kActivateNetworkMessage,
       base::Bind(&InternetOptionsHandler::ActivateNetwork,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback(kSetPreferNetworkMessage,
-      base::Bind(&InternetOptionsHandler::SetPreferNetworkCallback,
-                 base::Unretained(this)));
-  web_ui()->RegisterMessageCallback(kSetAutoConnectMessage,
-      base::Bind(&InternetOptionsHandler::SetAutoConnectCallback,
-                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kSetIPConfigMessage,
       base::Bind(&InternetOptionsHandler::SetIPConfigCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kShowMorePlanInfoMessage,
       base::Bind(&InternetOptionsHandler::ShowMorePlanInfoCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kSetApnMessage,
       base::Bind(&InternetOptionsHandler::SetApnCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kSetCarrierMessage,
       base::Bind(&InternetOptionsHandler::SetCarrierCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kSimOperationMessage,
       base::Bind(&InternetOptionsHandler::SimOperationCallback,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback(kSetServerHostname,
-      base::Bind(&InternetOptionsHandler::SetServerHostnameCallback,
-                 base::Unretained(this)));
 
   // networkingPrivate methods
   web_ui()->RegisterMessageCallback(kDisableNetworkTypeMessage,
       base::Bind(&InternetOptionsHandler::DisableNetworkTypeCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kEnableNetworkTypeMessage,
       base::Bind(&InternetOptionsHandler::EnableNetworkTypeCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kGetManagedPropertiesMessage,
       base::Bind(&InternetOptionsHandler::GetManagedPropertiesCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kRequestNetworkScanMessage,
       base::Bind(&InternetOptionsHandler::RequestNetworkScanCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kStartConnectMessage,
       base::Bind(&InternetOptionsHandler::StartConnectCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kStartDisconnectMessage,
       base::Bind(&InternetOptionsHandler::StartDisconnectCallback,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(kSetPropertiesMessage,
+      base::Bind(&InternetOptionsHandler::SetPropertiesCallback,
+                 base::Unretained(this)));
 }
 
 void InternetOptionsHandler::ShowMorePlanInfoCallback(
     const base::ListValue* args) {
   if (!web_ui())
     return;
   std::string service_path;
   if (args->GetSize() != 1 || !args->GetString(0, &service_path)) {
     NOTREACHED();
     return;
@@ skipping 298 matching lines @@
     return;
   if (device->type() != shill::kTypeCellular)
     return;
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->FirstNetworkByType(
           NetworkTypePattern::Cellular());
   if (network && network->path() == details_path_)
     UpdateConnectionData(network->path());
 }
 
-void InternetOptionsHandler::SetServerHostnameCallback(
+void InternetOptionsHandler::SetPropertiesCallback(
     const base::ListValue* args) {
-  std::string service_path, server_hostname;
+  std::string service_path;
+  const base::DictionaryValue* properties;
   if (args->GetSize() < 2 ||
       !args->GetString(0, &service_path) ||
-      !args->GetString(1, &server_hostname)) {
+      !args->GetDictionary(1, &properties)) {
     NOTREACHED();
     return;
   }
-  SetNetworkProperty(service_path,
-                     shill::kProviderHostProperty,
-                     new base::StringValue(server_hostname));
-}
-
-void InternetOptionsHandler::SetPreferNetworkCallback(
-    const base::ListValue* args) {
-  std::string service_path;
-  bool prefer_network;
-  if (args->GetSize() < 2 ||
-      !args->GetString(0, &service_path) ||
-      !args->GetBoolean(1, &prefer_network)) {
-    NOTREACHED();
-    return;
-  }
-  int priority = prefer_network ? kPreferredPriority : 0;
-  SetNetworkProperty(service_path,
-                     shill::kPriorityProperty,
-                     new base::FundamentalValue(priority));
-}
-
-void InternetOptionsHandler::SetAutoConnectCallback(
-    const base::ListValue* args) {
-  std::string service_path;
-  bool auto_connect;
-  if (args->GetSize() < 2 ||
-      !args->GetString(0, &service_path) ||
-      !args->GetBoolean(1, &auto_connect)) {
-    NOTREACHED();
-    return;
-  }
-  SetNetworkProperty(service_path,
-                     shill::kAutoConnectProperty,
-                     new base::FundamentalValue(auto_connect));
+  NetworkHandler::Get()->managed_network_configuration_handler()->SetProperties(
+      service_path, *properties,
+      base::Bind(&base::DoNothing),
+      base::Bind(&ShillError, "SetProperties"));
 }
 
 void InternetOptionsHandler::SetIPConfigCallback(const base::ListValue* args) {
   std::string service_path;
   if (!args->GetString(0, &service_path)) {
     NOTREACHED();
     return;
   }
   NetworkHandler::Get()->network_configuration_handler()->GetProperties(
       service_path,
@@ skipping 247 matching lines @@
   dictionary->SetBoolean(
       kTagWimaxAvailable,
       handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
   dictionary->SetBoolean(
       kTagWimaxEnabled,
       handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos