chrome/browser/chromeos/login/proxy_settings_dialog.cc - Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

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/chromeos/login/proxy_settings_dialog.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Mattias' comments. Created 7 years, 7 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/chromeos/login/proxy_settings_dialog.cc

diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc

index bfdb8cff2d0f2f2decad74226dac7be4f5551988..3fcc09266eac5f9d3b8142eb4d904ed6cea5d214 100644

--- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc

+++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc

@@ -60,7 +60,7 @@ ProxySettingsDialog::ProxySettingsDialog(LoginWebDialog::Delegate* delegate,

// Get network name for dialog title.

Profile* profile = ProfileHelper::GetSigninProfile();

PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();

- proxy_tracker->UIMakeActiveNetworkCurrent();

+ proxy_tracker->UIMakeDefaultNetworkCurrent();

std::string network_name;

proxy_tracker->UIGetCurrentNetworkName(&network_name);

SetDialogTitle(l10n_util::GetStringFUTF16(IDS_PROXY_PAGE_TITLE_FORMAT,

« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service_impl.h » ('j') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('J')