Cleanup of network code.

chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.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/options2/chromeos/internet_options_handler2.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 424 matching lines @@
 
   FillNetworkInfo(localized_strings);
 }
 
 void InternetOptionsHandler::InitializePage() {
   cros_->RequestNetworkScan();
 }
 
 void InternetOptionsHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
+  web_ui()->RegisterMessageCallback("networkCommand",
+      base::Bind(&InternetOptionsHandler::NetworkCommandCallback,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("refreshNetworks",
       base::Bind(&InternetOptionsHandler::RefreshNetworksCallback,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("buttonClickCallback",
-      base::Bind(&InternetOptionsHandler::ButtonClickCallback,
-                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("refreshCellularPlan",
       base::Bind(&InternetOptionsHandler::RefreshCellularPlanCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setPreferNetwork",
       base::Bind(&InternetOptionsHandler::SetPreferNetworkCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setAutoConnect",
       base::Bind(&InternetOptionsHandler::SetAutoConnectCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setIPConfig",
@@ skipping 580 matching lines @@
 }
 
 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
   // TODO(beng): This is an improper direct dependency on Browser. Route this
   // through some sort of delegate.
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   return browser->window()->GetNativeHandle();
 }
 
-void InternetOptionsHandler::ButtonClickCallback(const ListValue* args) {
+void InternetOptionsHandler::NetworkCommandCallback(const ListValue* args) {
   std::string str_type;
   std::string service_path;
   std::string command;
   if (args->GetSize() != 3 ||
       !args->GetString(0, &str_type) ||
       !args->GetString(1, &service_path) ||
       !args->GetString(2, &command)) {
     NOTREACHED();
     return;
   }
@@ skipping 237 matching lines @@
   if (default_value)
     value_dict->Set("default", default_value->DeepCopy());
   if (ui_data.managed())
     value_dict->SetString("controlledBy", "policy");
   else if (ui_data.recommended())
     value_dict->SetString("controlledBy", "recommended");
   settings->Set(key, value_dict);
 }
 
 }  // namespace options2