Remove unnecessary method and whitespace fixes.

BUG=none
TEST=manually open chrome://settings/internet and check if it works

Review URL: http://codereview.chromium.org/4405002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65175 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 18 deletions

diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index e59aef4..5a116ce 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -696,21 +696,6 @@ void InternetOptionsHandler::PopulateDictionaryDetails(
       L"options.InternetOptions.showDetailedInfo", dictionary);
 }
 
-void InternetOptionsHandler::PopupWirelessPassword(
-    const chromeos::WifiNetwork* network) {
-  DictionaryValue dictionary;
-  dictionary.SetString("servicePath", network->service_path());
-  if (network->encryption() == chromeos::SECURITY_8021X) {
-    dictionary.SetBoolean("certNeeded", true);
-    dictionary.SetString("ident", network->identity());
-    dictionary.SetString("cert", network->cert_path());
-  } else {
-    dictionary.SetBoolean("certNeeded", false);
-  }
-  dom_ui_->CallJavascriptFunction(
-      L"options.InternetOptions.showPasswordEntry", dictionary);
-}
-
 void InternetOptionsHandler::LoginCallback(const ListValue* args) {
   std::string service_path;
   std::string password;
@@ -822,7 +807,10 @@ void InternetOptionsHandler::ButtonClickCallback(const ListValue* args) {
           if (network->encryption() == chromeos::SECURITY_8021X) {
             PopulateDictionaryDetails(network, cros);
           } else {
-            PopupWirelessPassword(network);
+            DictionaryValue dictionary;
+            dictionary.SetString("servicePath", network->service_path());
+            dom_ui_->CallJavascriptFunction(
+                L"options.InternetOptions.showPasswordEntry", dictionary);
           }
         } else {
           cros->ConnectToWifiNetwork(
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.h b/chrome/browser/chromeos/dom_ui/internet_options_handler.h
index 71b4bd6..2874040 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.h
@@ -66,8 +66,6 @@ class InternetOptionsHandler
   void PopulateDictionaryDetails(const chromeos::Network* net,
                                  chromeos::NetworkLibrary* cros);
 
-  void PopupWirelessPassword(const chromeos::WifiNetwork* network);
-
   // Converts CellularDataPlan structure into dictionary for JS. Formats
   // plan settings into human readable texts.
   DictionaryValue* CellularDataPlanToDictionary(