Adding CookieSettings for storing cookie content settings.

chrome/browser/ui/webui/collected_cookies_ui_delegate.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/collected_cookies_ui_delegate.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 
 namespace {
@@ skipping 117 matching lines @@
   ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile,
                                                  delegate,
                                                  wrapper);
 }
 
 CollectedCookiesUIDelegate::CollectedCookiesUIDelegate(
     TabContentsWrapper* wrapper)
     : wrapper_(wrapper),
       closed_(false) {
   TabSpecificContentSettings* content_settings = wrapper->content_settings();
-  HostContentSettingsMap* host_content_settings_map =
-      wrapper->profile()->GetHostContentSettingsMap();
+  PrefService* prefs = wrapper->profile()->GetPrefs();
 
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
 
   allowed_cookies_tree_model_.reset(
       content_settings->GetAllowedCookiesTreeModel());
   blocked_cookies_tree_model_.reset(
       content_settings->GetBlockedCookiesTreeModel());
 
   CollectedCookiesSource* source = new CollectedCookiesSource(
-      host_content_settings_map->BlockThirdPartyCookies());
+      prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
   wrapper->profile()->GetChromeURLDataManager()->AddDataSource(source);
 }
 
 CollectedCookiesUIDelegate::~CollectedCookiesUIDelegate() {
 }
 
 bool CollectedCookiesUIDelegate::IsDialogModal() const {
   return false;
 }
 
@@ skipping 54 matching lines @@
 
 void CollectedCookiesUIDelegate::SetInfobarLabel(const std::string& text) {
   StringValue string(text);
   web_ui_->CallJavascriptFunction("setInfobarLabel", string);
 }
 
 void CollectedCookiesUIDelegate::AddContentException(
     CookieTreeOriginNode* origin_node, ContentSetting setting) {
   if (origin_node->CanCreateContentException()) {
     Profile* profile = wrapper_->profile();
-    origin_node->CreateContentException(profile->GetHostContentSettingsMap(),
+    origin_node->CreateContentException(CookieSettings::GetForProfile(profile),
                                         setting);
 
     SetInfobarLabel(GetInfobarLabel(setting, origin_node->GetTitle()));
   }
 }
 
 void CollectedCookiesUIDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 39 matching lines @@
   if (!args->GetString(0, &node_path))
     return;
 
   CookieTreeOriginNode* origin_node = GetOriginNode(
       blocked_cookies_tree_model_.get(), node_path);
   if (!origin_node)
     return;
 
   AddContentException(origin_node, CONTENT_SETTING_SESSION_ONLY);
 }