chrome/browser/prefs/proxy_prefs.h - 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/prefs/proxy_prefs.h

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

« chrome/browser/chromeos/ui_proxy_config_service.cc ('K') | « chrome/browser/net/pref_proxy_config_tracker_impl.cc ('k') | chrome/browser/prefs/proxy_prefs.cc » ('j') | chrome/browser/ui/webui/chromeos/login/network_state_informer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/proxy_prefs.h

diff --git a/chrome/browser/prefs/proxy_prefs.h b/chrome/browser/prefs/proxy_prefs.h

index 8c191ab9875551871eb61015e5c99966f852ff81..f9c3916248c119d9ecfca85e6cfc7ab3cd7da040 100644

--- a/chrome/browser/prefs/proxy_prefs.h

+++ b/chrome/browser/prefs/proxy_prefs.h

@@ -63,6 +63,7 @@ bool IntToProxyMode(int in_value, ProxyMode* out_value);

bool StringToProxyMode(const std::string& in_value, ProxyMode* out_value);

// Ownership of the return value is NOT passed to the caller.

const char* ProxyModeToString(ProxyMode mode);

+std::string ConfigStateToString(ConfigState state);

} // namespace ProxyPrefs