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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 12858013: Expose proxy profile configs to OS_IOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/ui/prefs/prefs_tab_helper.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 0951bf746fde81d02cc0978b0d54861093d04cb5..d2ecc1475f4caef5b9e418a41bbe238bf001bc9f 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -52,9 +52,9 @@
#include "net/http/transport_security_state.h"
#include "webkit/database/database_tracker.h"
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#endif
+#endif // defined(OS_ANDROID) || defined(OS_IOS)
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/preferences.h"
@@ -100,9 +100,9 @@ void OffTheRecordProfileImpl::Init() {
DCHECK_NE(IncognitoModePrefs::DISABLED,
IncognitoModePrefs::GetAvailability(profile_->GetPrefs()));
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
UseSystemProxy();
-#endif // defined(OS_ANDROID)
+#endif // defined(OS_ANDROID) || defined(OS_IOS)
// TODO(oshima): Remove the need to eagerly initialize the request context
// getter. chromeos::OnlineAttempt is illegally trying to access this
@@ -166,7 +166,7 @@ void OffTheRecordProfileImpl::InitHostZoomMap() {
parent_host_zoom_map->AddZoomLevelChangedCallback(zoom_callback_);
}
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
void OffTheRecordProfileImpl::UseSystemProxy() {
// Force the use of the system-assigned proxy when off the record.
const char kProxyMode[] = "mode";
@@ -180,7 +180,7 @@ void OffTheRecordProfileImpl::UseSystemProxy() {
dict->SetString(kProxyServer, "");
dict->SetString(kProxyBypassList, "");
}
-#endif // defined(OS_ANDROID)
+#endif // defined(OS_ANDROID) || defined(OS_IOS)
std::string OffTheRecordProfileImpl::GetProfileName() {
// Incognito profile should not return the profile name.
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698