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

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

Issue 983823002: Use GUID instead of servicePath in network settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_enable_extension_apis
Patch Set: Use guid instead of service_path for proxy prefs Created 5 years, 9 months 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
Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index c18207f3e61a0c85d80b009819359d7e41a24c1c..86eee8a50aa1ead32cb48985e47cbb4d5b900954 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -128,7 +128,7 @@ void CoreChromeOSOptionsHandler::RegisterMessages() {
void CoreChromeOSOptionsHandler::InitializeHandler() {
// This function is both called on the initial page load and on each reload.
// For the latter case, forget the last selected network.
- proxy_config_service_.SetCurrentNetwork(std::string());
+ proxy_config_service_.SetCurrentNetworkGuid("");
// And clear the cached configuration.
proxy_config_service_.UpdateFromPrefs();
@@ -368,13 +368,12 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues(
void CoreChromeOSOptionsHandler::SelectNetworkCallback(
const base::ListValue* args) {
- std::string service_path;
- if (args->GetSize() != 1 ||
- !args->GetString(0, &service_path)) {
+ std::string guid;
+ if (args->GetSize() != 1 || !args->GetString(0, &guid)) {
NOTREACHED();
return;
}
- proxy_config_service_.SetCurrentNetwork(service_path);
+ proxy_config_service_.SetCurrentNetworkGuid(guid);
NotifyProxyPrefsChanged();
}

Powered by Google App Engine
This is Rietveld 408576698