| 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 1a8378cf7f7eedc53c69329613205b894be4267c..82ae8218e9becb9e5ad72dac2723b27179c73399 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_impl.cc
|
| +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
|
| @@ -29,6 +29,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,8 +362,7 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
|
| return host_content_settings_map_.get();
|
| }
|
|
|
| -content::BrowserPluginGuestManager*
|
| - OffTheRecordProfileImpl::GetGuestManager() {
|
| +content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {
|
| #if defined(ENABLE_EXTENSIONS)
|
| return GuestViewManager::FromBrowserContext(this);
|
| #else
|
| @@ -370,7 +371,7 @@ content::BrowserPluginGuestManager*
|
| }
|
|
|
| quota::SpecialStoragePolicy*
|
| - OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
|
| +OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
|
| return GetExtensionSpecialStoragePolicy();
|
| }
|
|
|
| @@ -380,6 +381,11 @@ OffTheRecordProfileImpl::GetPushMessagingService() {
|
| return NULL;
|
| }
|
|
|
| +content::SSLHostStateDecisions*
|
| +OffTheRecordProfileImpl::GetSSLHostStateDecisions() {
|
| + return ChromeSSLHostStateDecisionsFactory::GetForProfile(this);
|
| +}
|
| +
|
| bool OffTheRecordProfileImpl::IsSameProfile(Profile* profile) {
|
| return (profile == this) || (profile == profile_);
|
| }
|
|
|