commit 30fde829775645a5ced0a89a56c83cba6c5fd9b8
author marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 28 09:49:05 2011
committer marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 28 09:49:05 2011
tree 6d1a8bf29e6a4e12d4969d7b273620e151f99bef
parent 6cec7ee2e7ee985410f26b0700274aa92d0ad3a6

Adding CookieSettings for storing cookie content settings.

Moving cookie-spesific logic from HostContentSettingsMap to CookieSettings.
Making it explicit that the "is cookie session only" decision only depends on the
primary url.

Also removes the migration code for the obsolete kCookieBehavior preference.

BUG=93335
TEST=CookieSettings.*


Review URL: http://codereview.chromium.org/8383004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107705 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e9a6dfe..7419011a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_shutdown.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/debugger/devtools_window.h"
@@ -162,6 +163,7 @@
   ProfileImpl::RegisterUserPrefs(user_prefs);
   PromoResourceService::RegisterUserPrefs(user_prefs);
   HostContentSettingsMap::RegisterUserPrefs(user_prefs);
+  CookieSettings::RegisterUserPrefs(user_prefs);
   DevToolsWindow::RegisterUserPrefs(user_prefs);
   PinnedTabCodec::RegisterUserPrefs(user_prefs);
   ExtensionPrefs::RegisterUserPrefs(user_prefs);