chrome/browser/profiles/profile.cc - Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData

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/profiles/profile.cc

Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit Created 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile.cc

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index fc5cde6eaf12f7ec39f3c81ad335d405066236d4..1354c3a374f754d273acce40cbb3b3008bd5bd50 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -188,9 +188,9 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

false,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

#endif

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

+#if defined(SPDY_PROXY_AUTH_ORIGIN)

data_reduction_proxy::RegisterSyncableProfilePrefs(registry);

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

+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)

#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS)

// Preferences related to the avatar bubble and user manager tutorials.

registry->RegisterIntegerPref(