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

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

Issue 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed broken include Created 6 years, 5 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
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..1d05bc215644404739839f13569748e18729740a 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_delegate.h"
+#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_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::SSLHostStateDelegate*
+OffTheRecordProfileImpl::GetSSLHostStateDelegate() {
+ return ChromeSSLHostStateDelegateFactory::GetForProfile(this);
+}
+
bool OffTheRecordProfileImpl::IsSameProfile(Profile* profile) {
return (profile == this) || (profile == profile_);
}

Powered by Google App Engine
This is Rietveld 408576698