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

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

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Tiny fixes (unnecessary #includes, win + mac fixes). Created 9 years, 4 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/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index e60dd6bd2ac042c1c15181c0719bc7819059078d..214833724eae4e0d2b662d1996dc2c4bbe6db26f 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -15,6 +15,7 @@
#include "base/string_number_conversions.h"
#include "base/task.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/extensions/extension_info_map.h"
@@ -223,6 +224,7 @@ void ProfileIOData::InitializeProfileParams(Profile* profile) {
params->io_thread = g_browser_process->io_thread();
params->host_content_settings_map = profile->GetHostContentSettingsMap();
+ params->cookie_settings = CookieSettings::GetForProfile(profile);
params->host_zoom_map = profile->GetHostZoomMap();
params->transport_security_state = profile->GetTransportSecurityState();
params->ssl_config_service = profile->GetSSLConfigService();
@@ -368,6 +370,10 @@ HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
return host_content_settings_map_;
}
+CookieSettings* ProfileIOData::GetCookieSettings() const {
+ return cookie_settings_;
+}
+
DesktopNotificationService* ProfileIOData::GetNotificationService() const {
return notification_service_;
}
@@ -470,6 +476,7 @@ void ProfileIOData::LazyInitialize() const {
quota_manager_ = profile_params_->quota_manager;
host_zoom_map_ = profile_params_->host_zoom_map;
host_content_settings_map_ = profile_params_->host_content_settings_map;
+ cookie_settings_ = profile_params_->cookie_settings;
notification_service_ = profile_params_->notification_service;
extension_info_map_ = profile_params_->extension_info_map;
prerender_manager_getter_ = profile_params_->prerender_manager_getter;

Powered by Google App Engine
This is Rietveld 408576698