chrome/browser/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.cc

diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc

index e57c8a9e1c802414366c56f857b1ce0a8133e0e4..6c0fd3fb77fe189b3ddc3191631d436d9b0b8fcd 100644

--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc

+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc

@@ -29,6 +29,7 @@

#include "components/keyed_service/content/browser_context_keyed_service_factory.h"

#include "components/keyed_service/core/keyed_service.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/render_view_host.h"

@@ -512,7 +513,7 @@ void PrefsTabHelper::InitIncognitoUserPrefStore(

pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);

pref_store->RegisterOverlayPref(prefs::kSaveFileDefaultDirectory);

#if defined(OS_ANDROID) || defined(OS_IOS)

- pref_store->RegisterOverlayPref(prefs::kProxy);

+ pref_store->RegisterOverlayPref(proxy_config::prefs::kProxy);

#endif // defined(OS_ANDROID) || defined(OS_IOS)

}