summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_prefs.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/browser_prefs.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/browser_prefs.cc')
-rw-r--r--chrome/browser/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 85f35a0..23e7549 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/host_zoom_map.h"
#include "chrome/browser/intranet_redirect_detector.h"
#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/net/chrome_cookie_policy.h"
#include "chrome/browser/net/dns_global.h"
#include "chrome/browser/page_info_model.h"
#include "chrome/browser/password_manager/password_manager.h"
@@ -98,6 +99,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
HostZoomMap::RegisterUserPrefs(user_prefs);
DevToolsManager::RegisterUserPrefs(user_prefs);
Blacklist::RegisterUserPrefs(user_prefs);
+ ChromeCookiePolicy::RegisterUserPrefs(user_prefs);
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port.
BrowserActionsContainer::RegisterUserPrefs(user_prefs);
#if defined(OS_WIN)