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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index ca279e0368819315d677aa169a6a8fd0550e38e1..961c29b97f643f1323206df91dcd4b15288facfd 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -54,6 +54,10 @@
#include "net/http/http_server_properties.h"
#include "webkit/database/database_tracker.h"
+#if defined(OS_ANDROID)
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
+#endif
+
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ -84,6 +88,16 @@ OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
prefs_(real_profile->GetOffTheRecordPrefs()),
ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
start_time_(Time::Now()) {
+#if defined(OS_ANDROID)
rpetterson 2012/09/28 18:10:58 Is it possible to group these into a single functi
bengr (incorrect) 2012/10/01 18:52:45 Done.
+ const char kProxyMode[] = "mode";
+ const char kProxyServer[] = "server";
+ const char kProxyBypassList[] = "bypass_list";
+ DictionaryPrefUpdate update(prefs_, prefs::kProxy);
+ DictionaryValue* dict = update.Get();
+ dict->SetString(kProxyMode, ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
+ dict->SetString(kProxyServer, "");
+ dict->SetString(kProxyBypassList, "");
+#endif
}
void OffTheRecordProfileImpl::Init() {
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698