chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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, 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

« chrome/browser/chromeos/proxy_config_service_impl.cc ('K') | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/ui/webui/options/advanced_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

===================================================================

--- chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc (revision 108608)

+++ chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc (working copy)

@@ -66,7 +66,7 @@

ProxySettingsUI::ProxySettingsUI(TabContents* contents)

: ChromeWebUI(contents),

proxy_settings_(NULL),

- proxy_handler_(new ProxyHandler) {

+ proxy_handler_(new ProxyHandler(GetProfile())) {

// |localized_strings| will be owned by ProxySettingsHTMLSource.

DictionaryValue* localized_strings = new DictionaryValue();

@@ -103,9 +103,10 @@

}

if (proxy_settings()) {

proxy_settings()->MakeActiveNetworkCurrent();

- std::string network = proxy_settings()->GetCurrentNetworkName();

- if (!network.empty())

- proxy_handler_->SetNetworkName(network);

+ std::string network_name;

+ GetProfile()->GetProxyConfigTracker()->UIGetCurrentNetworkName(

+ &network_name);

+ proxy_handler_->SetNetworkName(network_name);

}