Adding CookieSettings for storing cookie content settings.

chrome/browser/ui/gtk/collected_cookies_gtk.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/gtk/collected_cookies_gtk.h"
 
 #include <string>
 
-#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/infobars/infobar_tab_helper.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 // Width and height of the cookie tree view.
 const int kTreeViewWidth = 450;
 const int kTreeViewHeight = 150;
 
@@ skipping 201 matching lines @@
 
   // Wrap the vbox inside an hbox so that we can specify padding along the
   // horizontal axis.
   GtkWidget* box = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(box), cookie_list_vbox, TRUE, TRUE,
                      ui::kControlSpacing);
   return box;
 }
 
 GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
-  HostContentSettingsMap* host_content_settings_map =
-      wrapper_->profile()->GetHostContentSettingsMap();
+  PrefService* prefs = wrapper_->profile()->GetPrefs();
 
   GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(
-          host_content_settings_map->BlockThirdPartyCookies() ?
+          prefs->GetBoolean(prefs::kBlockThirdPartyCookies) ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
               IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL).c_str());
   gtk_widget_set_size_request(label, kTreeViewWidth, -1);
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), label, TRUE, TRUE,
                      ui::kControlSpacing);
 
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
@@ skipping 194 matching lines @@
         CookieTreeNode::DetailedInfo::TYPE_ORIGIN)
       continue;
     CookieTreeOriginNode* origin_node = static_cast<CookieTreeOriginNode*>(
         node);
     if (origin_node->CanCreateContentException()) {
       if (!last_domain_name.empty())
         multiple_domains_added = true;
       last_domain_name = origin_node->GetTitle();
       Profile* profile = wrapper_->profile();
       origin_node->CreateContentException(
-          profile->GetHostContentSettingsMap(), setting);
+          CookieSettings::GetForProfile(profile), setting);
     }
   }
   g_list_foreach(paths, reinterpret_cast<GFunc>(gtk_tree_path_free), NULL);
   g_list_free(paths);
   if (last_domain_name.empty()) {
     gtk_widget_hide(infobar_);
   } else {
     gtk_label_set_text(
         GTK_LABEL(infobar_label_), GetInfobarLabel(
             setting, multiple_domains_added, last_domain_name).c_str());
@@ skipping 32 matching lines @@
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
   gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
   g_signal_handlers_unblock_by_func(
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
 }
 
 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
 }