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: Rebased. 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

« no previous file with comments | « chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc ('k') | chrome/browser/chromeos/net/onc_utils.cc » ('j') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..98364b08a4822a3dae6a6528836a5e3867c06915 100644

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

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

@@ -8,6 +8,7 @@

#include "chrome/browser/chromeos/login/helper.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/proxy_config_service_impl.h"

+#include "chrome/browser/chromeos/ui_proxy_config_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/url_constants.h"

@@ -59,10 +60,11 @@ ProxySettingsDialog::ProxySettingsDialog(LoginWebDialog::Delegate* delegate,

// Get network name for dialog title.

Profile* profile = ProfileHelper::GetSigninProfile();

- PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();

- proxy_tracker->UIMakeActiveNetworkCurrent();

+ UIProxyConfigService& proxy_config_service =

+ profile->GetProxyConfigTracker()->GetUIService();

+ proxy_config_service.MakeActiveNetworkCurrent();

std::string network_name;

- proxy_tracker->UIGetCurrentNetworkName(&network_name);

+ proxy_config_service.GetCurrentNetworkName(&network_name);

SetDialogTitle(l10n_util::GetStringFUTF16(IDS_PROXY_PAGE_TITLE_FORMAT,

ASCIIToUTF16(network_name)));

}