chrome/browser/ui/prefs/prefs_tab_helper.cc - Issue 10985083: Upstreaming SpdyProxy-related switches, OTR logic, and histograms

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 10985083: Upstreaming SpdyProxy-related switches, OTR logic, and histograms (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Alphabetized includes Created 8 years, 2 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

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 35b94a6f89f6e9c1ebfd71461edde21ba8bed601..94c5e2b392dddc42c7a4cb529f85972f5167072f 100644

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

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

@@ -389,6 +389,9 @@ void PrefsTabHelper::InitIncognitoUserPrefStore(

// profile. All preferences that store information about the browsing history

// or behavior of the user should have this property.

pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);

+#if defined(OS_ANDROID)

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

+#endif

}

// static

« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/renderer/page_load_histograms.cc » ('j') | no next file with comments »