Store blocked cookies in the tab contents.

chrome/browser/content_setting_image_model.cc

 // Copyright (c) 2010 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/content_setting_image_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 41 matching lines @@
 };
 
 
 ContentSettingBlockedImageModel::ContentSettingBlockedImageModel(
     ContentSettingsType content_settings_type)
     : ContentSettingImageModel(content_settings_type) {
 }
 
 void ContentSettingBlockedImageModel::UpdateFromTabContents(
     const TabContents* tab_contents) {
-  if (!tab_contents ||
-      !tab_contents->IsContentBlocked(get_content_settings_type())) {
+  TabSpecificContentSettings* content_settings = tab_contents ?
+      tab_contents->GetTabSpecificContentSettings() : NULL;
+  if (!content_settings ||
+      !content_settings->IsContentBlocked(get_content_settings_type())) {
     set_visible(false);
     return;
   }
   set_icon(kBlockedIconIDs[get_content_settings_type()]);
   set_tooltip(
       l10n_util::GetStringUTF8(kTooltipIDs[get_content_settings_type()]));
   set_visible(true);
 }
 
 ContentSettingGeolocationImageModel::ContentSettingGeolocationImageModel()
     : ContentSettingImageModel(CONTENT_SETTINGS_TYPE_GEOLOCATION) {
 }
 
 void ContentSettingGeolocationImageModel::UpdateFromTabContents(
     const TabContents* tab_contents) {
   if (!tab_contents) {
     set_visible(false);
     return;
   }
+  TabSpecificContentSettings* content_settings =
+      tab_contents->GetTabSpecificContentSettings();
   const GeolocationSettingsState& settings_state =
-      tab_contents->geolocation_settings_state();
+      content_settings->geolocation_settings_state();
   if (settings_state.state_map().empty()) {
     set_visible(false);
     return;
   }
   set_visible(true);
   unsigned int tab_state_flags = 0;
   settings_state.GetDetailedInfo(NULL, &tab_state_flags);
   // If any embedded site has access the allowed icon takes priority over the
   // blocked icon.
   if (tab_state_flags & GeolocationSettingsState::TABSTATE_HAS_ANY_ALLOWED) {
@@ skipping 25 matching lines @@
 // static
 ContentSettingImageModel*
     ContentSettingImageModel::CreateContentSettingImageModel(
     ContentSettingsType content_settings_type) {
   if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
     return new ContentSettingGeolocationImageModel();
   if (content_settings_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
     return new ContentSettingNotificationsImageModel();
   return new ContentSettingBlockedImageModel(content_settings_type);
 }