Adding CookieSettings for storing cookie content settings.

chrome/browser/ui/views/collected_cookies_win.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/views/collected_cookies_win.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/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/constrained_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
@@ skipping 252 matching lines @@
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(block_allowed_button_, 1, 1, GridLayout::LEADING,
                   GridLayout::CENTER);
 
   return pane;
 }
 
 views::View* CollectedCookiesWin::CreateBlockedPane() {
   TabSpecificContentSettings* content_settings = wrapper_->content_settings();
 
-  HostContentSettingsMap* host_content_settings_map =
-      wrapper_->profile()->GetHostContentSettingsMap();
+  PrefService* prefs = wrapper_->profile()->GetPrefs();
 
   // Create the controls that go into the pane.
   blocked_label_ = new views::Label(
       l10n_util::GetStringUTF16(
-          host_content_settings_map->BlockThirdPartyCookies() ?
+          prefs->GetBoolean(prefs::kBlockThirdPartyCookies) ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
               IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL));
   blocked_label_->SetMultiLine(true);
   blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   blocked_cookies_tree_model_.reset(
       content_settings->GetBlockedCookiesTreeModel());
   blocked_cookies_tree_ = new views::TreeView();
   blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
   blocked_cookies_tree_->SetController(this);
   blocked_cookies_tree_->SetRootShown(false);
@@ skipping 167 matching lines @@
   } else {
     cookie_info_view_->ClearCookieDisplay();
   }
 }
 
 void CollectedCookiesWin::AddContentException(views::TreeView* tree_view,
                                               ContentSetting setting) {
   CookieTreeOriginNode* origin_node =
       static_cast<CookieTreeOriginNode*>(tree_view->GetSelectedNode());
   Profile* profile = wrapper_->profile();
-  origin_node->CreateContentException(profile->GetHostContentSettingsMap(),
+  origin_node->CreateContentException(CookieSettings::GetForProfile(profile),
                                       setting);
   infobar_->UpdateVisibility(true, setting, origin_node->GetTitle());
   gfx::Rect bounds = GetWidget()->GetClientAreaScreenBounds();
 #if defined(USE_AURA)
   // TODO(beng): convert the conversion to use views conversion methods.
   NOTIMPLEMENTED();
 #else
   // NativeWidgetWin::GetBounds returns the bounds relative to the parent
   // window, while NativeWidgetWin::SetBounds wants screen coordinates. Do the
   // translation here until http://crbug.com/52851 is fixed.
   POINT topleft = {bounds.x(), bounds.y()};
   MapWindowPoints(HWND_DESKTOP, wrapper_->tab_contents()->GetNativeView(),
                   &topleft, 1);
   gfx::Size size = GetWidget()->GetRootView()->GetPreferredSize();
   bounds.SetRect(topleft.x, topleft.y, size.width(), size.height());
   GetWidget()->SetBounds(bounds);
 #endif
   status_changed_ = true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver implementation.
 
 void CollectedCookiesWin::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
   window_->CloseConstrainedWindow();
 }