chrome/browser/extensions/api/settings_private/prefs_util.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

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/extensions/api/settings_private/prefs_util.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updating for win p/f Created 5 years, 4 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/extensions/api/settings_private/prefs_util.cc

diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc

index 20547c74d729559be19c60c927ca6ef075c4a53e..1127dcf029ff69b00167078af1b5846a30bf9290 100644

--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc

+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc

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

#include "chrome/browser/extensions/chrome_extension_function.h"

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

#include "chrome/common/pref_names.h"

+#include "components/proxy_config/proxy_config_pref_names.h"

#include "components/url_formatter/url_fixer.h"

#if defined(OS_CHROMEOS)

@@ -321,7 +322,7 @@ PrefService* PrefsUtil::FindServiceForPref(const std::string& pref_name) {

// Elsewhere the proxy settings are stored in local state.

// See http://crbug.com/157147

- if (pref_name == prefs::kProxy) {

+ if (pref_name == proxy_config::prefs::kProxy) {

#if defined(OS_CHROMEOS)

return user_prefs;

#else