Revert of Use networkingPrivate.startConnect

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 73 matching lines @@
 const char kSetVPNProvidersFunction[] = "options.VPNProviders.setProviders";
 const char kRefreshNetworkDataFunction[] =
     "options.network.NetworkList.refreshNetworkData";
 const char kUpdateConnectionDataFunction[] =
     "options.internet.DetailsInternetPage.updateConnectionData";
 
 // JS methods to show additional UI.
 const char kShowMorePlanInfoMessage[] = "showMorePlanInfo";
 const char kSimOperationMessage[] = "simOperation";
 
+// TODO(stevenjb): Replace these with the matching networkingPrivate methods.
+// crbug.com/279351.
+const char kStartConnectMessage[] = "startConnect";
+
 // TODO(stevenjb): Deprecate this once we handle events in the JS.
 const char kSetNetworkGuidMessage[] = "setNetworkGuid";
 
 // TODO(stevenjb): Deprecate these and integrate with settings Web UI.
 const char kAddVPNConnectionMessage[] = "addVPNConnection";
 const char kAddNonVPNConnectionMessage[] = "addNonVPNConnection";
 const char kConfigureNetworkMessage[] = "configureNetwork";
 
 const char kLoadVPNProviders[] = "loadVPNProviders";
 
@@ skipping 145 matching lines @@
       base::Bind(&InternetOptionsHandler::SimOperationCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       kLoadVPNProviders,
       base::Bind(&InternetOptionsHandler::LoadVPNProvidersCallback,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(kSetNetworkGuidMessage,
       base::Bind(&InternetOptionsHandler::SetNetworkGuidCallback,
                  base::Unretained(this)));
+
+  // networkingPrivate methods
+  web_ui()->RegisterMessageCallback(kStartConnectMessage,
+      base::Bind(&InternetOptionsHandler::StartConnectCallback,
+                 base::Unretained(this)));
 }
 
 void InternetOptionsHandler::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
   if (IsVPNProvider(extension))
     UpdateVPNProviders();
 }
 
 void InternetOptionsHandler::OnExtensionUnloaded(
@@ skipping 61 matching lines @@
 void InternetOptionsHandler::SetNetworkGuidCallback(
     const base::ListValue* args) {
   std::string guid;
   if (args->GetSize() != 1 || !args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
   details_guid_ = guid;
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+// networkingPrivate implementation methods. TODO(stevenjb): Use the
+// networkingPrivate API directly in the settings JS and deprecate these
+// methods. crbug.com/279351.
+
+void InternetOptionsHandler::StartConnectCallback(const base::ListValue* args) {
+  std::string guid;
+  if (!args->GetString(0, &guid)) {
+    NOTREACHED();
+    return;
+  }
+  std::string service_path = ServicePathFromGuid(guid);
+  if (!service_path.empty())
+    ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void InternetOptionsHandler::UpdateVPNProviders() {
   extensions::ExtensionRegistry* const registry =
       GetExtensionRegistryForPrimaryUser();
 
   base::ListValue vpn_providers;
   const extensions::ExtensionSet& extensions = registry->enabled_extensions();
   for (const auto& extension : extensions) {
     if (IsVPNProvider(extension.get())) {
@@ skipping 245 matching lines @@
   dictionary->SetBoolean(
       kTagWimaxAvailable,
       handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
   dictionary->SetBoolean(
       kTagWimaxEnabled,
       handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos