summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 21:00:34 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 21:00:34 +0000
commit15e84d9dad946d522ca6b5acf7db721a4ea76946 (patch)
treeaf079dd93c04f3736f10ac77da8a86ce099cc4d2 /chrome/browser/profile.cc
parent1cc71de3863b49ba125576bdff84d739356070fb (diff)
downloadchromium_src-15e84d9dad946d522ca6b5acf7db721a4ea76946.zip
chromium_src-15e84d9dad946d522ca6b5acf7db721a4ea76946.tar.gz
chromium_src-15e84d9dad946d522ca6b5acf7db721a4ea76946.tar.bz2
Implement extended cookie controls.
BUG=32782 TEST=none Review URL: http://codereview.chromium.org/554119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index c197a78..acfeb61 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -32,6 +32,7 @@
#include "chrome/browser/host_content_settings_map.h"
#include "chrome/browser/host_zoom_map.h"
#include "chrome/browser/in_process_webkit/webkit_context.h"
+#include "chrome/browser/net/chrome_cookie_policy.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/ssl_config_service_manager.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
@@ -431,6 +432,10 @@ class OffTheRecordProfileImpl : public Profile,
return NULL;
}
+ virtual ChromeCookiePolicy* GetCookiePolicy() {
+ return GetOriginalProfile()->GetCookiePolicy();
+ }
+
virtual void ShutdownSessionService() {
// We don't allow a session service, nothing to do.
}
@@ -1168,6 +1173,13 @@ SessionService* ProfileImpl::GetSessionService() {
return session_service_.get();
}
+ChromeCookiePolicy* ProfileImpl::GetCookiePolicy() {
+ if (!cookie_policy_.get())
+ cookie_policy_.reset(new ChromeCookiePolicy(this));
+ return cookie_policy_.get();
+}
+
+
void ProfileImpl::ShutdownSessionService() {
if (shutdown_session_service_)
return;