chrome/browser/ui/webui/chromeos/proxy_settings_ui.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/ui/webui/chromeos/proxy_settings_ui.cc

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

Patch Set: Renamed ConfigStateToString. 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

« chrome/browser/net/pref_proxy_config_tracker_impl.cc ('K') | « chrome/browser/prefs/proxy_prefs.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('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

diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

index f62ddab6a6c99348954cf8f10eb5a737d97f0087..9c2dc530b122b586df310712ba55f68d641b8528 100644

--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

@@ -11,6 +11,7 @@

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

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/system/statistics_provider.h"

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

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

#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"

#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"

@@ -126,10 +127,11 @@ void ProxySettingsUI::InitializeHandlers() {

core_handler_->InitializePage();

proxy_handler_->InitializePage();

Profile* profile = Profile::FromWebUI(web_ui());

- 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);

}

} // namespace chromeos