chrome/browser/chromeos/ui_proxy_config_service.h - Issue 289383004: Merge FavoriteState into NetworkState

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/ui_proxy_config_service.h

Issue 289383004: Merge FavoriteState into NetworkState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 6 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:

Index: chrome/browser/chromeos/ui_proxy_config_service.h

diff --git a/chrome/browser/chromeos/ui_proxy_config_service.h b/chrome/browser/chromeos/ui_proxy_config_service.h

index 44c1da833c6ec3b5ee7f31d3764185a3f68a9330..c6e28bbd3cd0fba209d8248692c837bf80f1ba60 100644

--- a/chrome/browser/chromeos/ui_proxy_config_service.h

+++ b/chrome/browser/chromeos/ui_proxy_config_service.h

@@ -14,7 +14,7 @@ class PrefService;

namespace chromeos {

-class FavoriteState;

+class NetworkState;

// This class is only accessed from the UI via Profile::GetProxyConfigTracker to

// allow the user to read and modify the proxy configuration via

@@ -55,7 +55,7 @@ class UIProxyConfigService {

// |network| and if user is using shared proxies. The effective config is

// stored in |current_ui_config_| but not activated on network stack, and

// hence, not picked up by observers.

- void DetermineEffectiveConfig(const FavoriteState& network);

+ void DetermineEffectiveConfig(const NetworkState& network);

// Service path of network whose proxy configuration is being displayed or

// edited via UI.