| Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc (revision 112023)
|
| +++ chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc (working copy)
|
| @@ -517,10 +517,6 @@
|
| 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));
|
| @@ -569,9 +565,6 @@
|
| 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)));
|
| @@ -615,20 +608,6 @@
|
| 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;
|
|
|