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 7612d381701a55ba481acd71d89d57ce70c3c872..7c514666cb856ad5d54efaab844481575e427464 100644 |
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc |
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc |
@@ -28,6 +28,8 @@ |
#include "chrome/browser/plugins/plugin_prefs.h" |
#include "chrome/browser/prefs/incognito_mode_prefs.h" |
#include "chrome/browser/prefs/pref_service_syncable.h" |
+#include "chrome/browser/ssl/chrome_ssl_host_state_decisions.h" |
+#include "chrome/browser/ssl/chrome_ssl_host_state_decisions_factory.h" |
#include "chrome/browser/themes/theme_service.h" |
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
#include "chrome/common/chrome_constants.h" |
@@ -360,7 +362,7 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() { |
} |
content::BrowserPluginGuestManager* |
- OffTheRecordProfileImpl::GetGuestManager() { |
+OffTheRecordProfileImpl::GetGuestManager() { |
#if defined(ENABLE_EXTENSIONS) |
return GuestViewManager::FromBrowserContext(this); |
#else |
@@ -369,7 +371,7 @@ content::BrowserPluginGuestManager* |
} |
quota::SpecialStoragePolicy* |
- OffTheRecordProfileImpl::GetSpecialStoragePolicy() { |
+OffTheRecordProfileImpl::GetSpecialStoragePolicy() { |
return GetExtensionSpecialStoragePolicy(); |
} |
@@ -379,6 +381,11 @@ OffTheRecordProfileImpl::GetPushMessagingService() { |
return NULL; |
} |
+content::SSLHostStateDecisions* |
+OffTheRecordProfileImpl::GetSSLHostStateDecisions() { |
+ return ChromeSSLHostStateDecisionsFactory::GetForProfile(this); |
felt
2014/07/07 22:26:39
how do these changes play with incognito? I assume
jww
2014/07/08 17:35:41
Right. Incognito's behavior effectively remains un
|
+} |
+ |
bool OffTheRecordProfileImpl::IsSameProfile(Profile* profile) { |
return (profile == this) || (profile == profile_); |
} |