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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
« chrome/browser/net/pref_proxy_config_service.cc ('K') | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc (revision 103881)
+++ chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc (working copy)
@@ -102,10 +102,9 @@
(static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
}
if (proxy_settings()) {
- proxy_settings()->MakeActiveNetworkCurrent();
+ proxy_settings()->MakeActiveNetworkCurrentWithProfile(GetProfile());
std::string network = proxy_settings()->GetCurrentNetworkName();
- if (!network.empty())
- proxy_handler_->SetNetworkName(network);
+ proxy_handler_->SetNetworkName(network);
}
}
« chrome/browser/net/pref_proxy_config_service.cc ('K') | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698