Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 8 years, 3 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/profiles/off_the_record_profile_impl.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bf099f7c2c61ce603d374f740212a3504ebe0b9d..aca514a9264e9984ad51097712fd6ac225bec712 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -384,6 +384,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
« chrome/browser/profiles/off_the_record_profile_impl.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698