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

Unified Diff: chrome/browser/chromeos/dom_ui/internet_options_handler.cc

Issue 5094002: Fix favorite and auto_connect property usage (again) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browsertest. Created 10 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/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/dom_ui/network_menu_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dom_ui/internet_options_handler.cc
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index 207cb8793d2c5d34a04457bdbd907b527193dfba..cd66af9c431610086b14feddb55716104ee1e0b2 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -158,7 +158,7 @@ void InternetOptionsHandler::GetLocalizedValues(
localized_strings->SetString("inetPassProtected",
l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NET_PROTECTED));
- localized_strings->SetString("inetRememberNetwork",
+ localized_strings->SetString("inetAutoConnectNetwork",
l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
localized_strings->SetString("inetCertPkcs",
@@ -459,11 +459,11 @@ DictionaryValue* InternetOptionsHandler::CellularDataPlanToDictionary(
void InternetOptionsHandler::SetDetailsCallback(const ListValue* args) {
std::string service_path;
- std::string remember;
+ std::string auto_connect_str;
if (args->GetSize() < 2 ||
!args->GetString(0, &service_path) ||
- !args->GetString(1, &remember)) {
+ !args->GetString(1, &auto_connect_str)) {
NOTREACHED();
return;
}
@@ -501,7 +501,7 @@ void InternetOptionsHandler::SetDetailsCallback(const ListValue* args) {
}
}
- bool auto_connect = remember == "true";
+ bool auto_connect = auto_connect_str == "true";
if (auto_connect != network->auto_connect()) {
network->set_auto_connect(auto_connect);
changed = true;
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/dom_ui/network_menu_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698