Remove import ONC option from internet settings (to be moved to net-internals).

BUG=chromium-os:23472
TEST=Go to chrome://settings/internet, should not see import network settings option.

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

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

5 files changed, 0 insertions, 41 deletions

diff --git a/chrome/browser/resources/options/chromeos/internet_options.html b/chrome/browser/resources/options/chromeos/internet_options.html
index 24a7628..651540a 100644
--- a/chrome/browser/resources/options/chromeos/internet_options.html
+++ b/chrome/browser/resources/options/chromeos/internet_options.html
@@ -37,10 +37,6 @@
            <span i18n-content="enableDataRoaming"></span>
          </label>
        </div>
-       <div id="import-network-settings">
-         <div i18n-content="importNetworkSettings"></div>
-         <input type="file" name="network_settings" id="upload-network-settings"/>
-       </div>
      </div>
     </section>
     <section id="wired-section">
diff --git a/chrome/browser/resources/options/chromeos/internet_options.js b/chrome/browser/resources/options/chromeos/internet_options.js
index 860651f..6391c9e 100644
--- a/chrome/browser/resources/options/chromeos/internet_options.js
+++ b/chrome/browser/resources/options/chromeos/internet_options.js
@@ -90,14 +90,6 @@ cr.define('options', function() {
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_ShowProxySettings']);
       });
-      $('upload-network-settings').addEventListener('change', function(event) {
-        var file = event.target.files[0];
-        var reader = new FileReader();
-        reader.onloadend = function(e) {
-          chrome.send('importNetworkSettings', [this.result]);
-        };
-        reader.readAsText(file);
-      }, false);
       $('buyplanDetails').addEventListener('click', function(event) {
         chrome.send('buyDataPlan', []);
         OptionsPage.closeOverlay();
diff --git a/chrome/browser/resources/options/chromeos/internet_options_page.css b/chrome/browser/resources/options/chromeos/internet_options_page.css
index dd2ce95..c7ab791 100644
--- a/chrome/browser/resources/options/chromeos/internet_options_page.css
+++ b/chrome/browser/resources/options/chromeos/internet_options_page.css
@@ -80,13 +80,6 @@ html[dir='rtl'] .network-item-text {
   background: right center no-repeat;
 }
 
-input[type='file'] {
-  margin-top: 5px;
-}
-
-#import-network-settings {
-  margin-top: 10px;
-}
 .network-item[connected] > * > .network-name-label {
   font-weight: bold;
 }
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 15e9e7f..7a315c8 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -530,10 +530,6 @@ void InternetOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES));
   localized_strings->SetString("enableDataRoaming",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING));
-  localized_strings->SetString("importNetworkSettings",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_IMPORT_NETWORK_SETTINGS));
-  localized_strings->SetString("invalidNetworkSettings",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_INVALID_NETWORK_SETTINGS));
   localized_strings->SetString("generalNetworkingTitle",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_CONTROL_TITLE));
@@ -582,9 +578,6 @@ void InternetOptionsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("disableCellular",
       base::Bind(&InternetOptionsHandler::DisableCellularCallback,
                  base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("importNetworkSettings",
-      base::Bind(&InternetOptionsHandler::ImportNetworkSettingsCallback,
-                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("buyDataPlan",
       base::Bind(&InternetOptionsHandler::BuyDataPlanCallback,
                  base::Unretained(this)));
@@ -628,20 +621,6 @@ void InternetOptionsHandler::DisableCellularCallback(const ListValue* args) {
   cros_->EnableCellularNetworkDevice(false);
 }
 
-void InternetOptionsHandler::ImportNetworkSettingsCallback(
-    const ListValue* args) {
-  std::string onc_blob;
-  if (args->GetSize() != 1 ||
-      !args->GetString(0, &onc_blob)) {
-    NOTREACHED();
-    return;
-  }
-
-  if (!cros_->LoadOncNetworks(onc_blob))
-    web_ui_->CallJavascriptFunction(
-        "options.InternetOptions.invalidNetworkSettings");
-}
-
 void InternetOptionsHandler::BuyDataPlanCallback(const ListValue* args) {
   if (!web_ui_)
     return;
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
index 5fd6182..50e3dcc 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
@@ -87,7 +87,6 @@ class InternetOptionsHandler
   void DisableWifiCallback(const base::ListValue* args);
   void EnableCellularCallback(const base::ListValue* args);
   void DisableCellularCallback(const base::ListValue* args);
-  void ImportNetworkSettingsCallback(const base::ListValue* args);
   void BuyDataPlanCallback(const base::ListValue* args);
   void SetApnCallback(const base::ListValue* args);
   void SetSimCardLockCallback(const base::ListValue* args);