Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6949)

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 8764008: Remove import ONC option from internet settings (to be moved to net-internals). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove localized strings Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698