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

Unified Diff: chrome/browser/chromeos/login/ui/proxy_settings_dialog.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
« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
index 21aae2531a011d72147a96dec96021f04b81527e..a91b2e3b3d71dae381300ae4b0e89d7f9d540eeb 100644
--- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
@@ -37,11 +37,11 @@ int CalculateSize(int screen_size, int min_comfortable, float desired_ratio) {
return std::min(screen_size, desired_size);
}
-GURL GetURLForProxySettings(const std::string& service_path) {
+GURL GetURLForProxySettings(const std::string& guid) {
std::string url(chrome::kChromeUIProxySettingsURL);
url += base::StringPrintf(
kProxySettingsURLParam,
- net::EscapeUrlEncodedData(service_path, true).c_str());
+ net::EscapeUrlEncodedData(guid, true).c_str());
return GURL(url);
}
@@ -61,7 +61,7 @@ ProxySettingsDialog::ProxySettingsDialog(
delegate,
window,
base::string16(),
- GetURLForProxySettings(network.path())) {
+ GetURLForProxySettings(network.guid())) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
++instance_count_;
« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698