HostContentSettingsMap refactoring.

chrome/browser/ui/content_settings/content_setting_bubble_model.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/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/favicon/favicon_tab_helper.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/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
@@ skipping 228 matching lines @@
       {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_NO_ACTION},
       {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_NO_ACTION},
     };
     std::string radio_block_label;
     radio_block_label = l10n_util::GetStringUTF8(
         GetIdForContentType(kBlockIDs, arraysize(kBlockIDs), content_type()));
 
     radio_group.radio_items.push_back(radio_allow_label);
     radio_group.radio_items.push_back(radio_block_label);
     HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
-    ContentSetting mostRestrictiveSetting;
+    CookieSettings* cookie_settings =
+        CookieSettings::GetForProfile(profile());
+    ContentSetting most_restrictive_setting;
     if (resources.empty()) {
-      mostRestrictiveSetting =
-          content_type() == CONTENT_SETTINGS_TYPE_COOKIES ?
-              map->GetCookieContentSetting(url, url, true) :
-              map->GetContentSetting(url, url, content_type(), std::string());
+      if (content_type() == CONTENT_SETTINGS_TYPE_COOKIES) {
+        if (cookie_settings->IsSettingCookieAllowed(url, url)) {

[Bernhard Bauer, 2011/09/14 16:01:36]

I think you could get this setting via
|cookie_settings->GetCookieContentSetting| as well.

+          if (cookie_settings->IsCookieSessionOnly(url))
+            most_restrictive_setting = CONTENT_SETTING_SESSION_ONLY;
+          else
+            most_restrictive_setting = CONTENT_SETTING_ALLOW;
+        } else {
+          most_restrictive_setting = CONTENT_SETTING_BLOCK;
+        }
+      } else {
+        most_restrictive_setting =
+            map->GetContentSetting(url, url, content_type(), std::string());
+      }
     } else {
-      mostRestrictiveSetting = CONTENT_SETTING_ALLOW;
+      most_restrictive_setting = CONTENT_SETTING_ALLOW;
       for (std::set<std::string>::const_iterator it = resources.begin();
            it != resources.end(); ++it) {
         ContentSetting setting = map->GetContentSetting(url,
                                                         url,
                                                         content_type(),
                                                         *it);
         if (setting == CONTENT_SETTING_BLOCK) {
-          mostRestrictiveSetting = CONTENT_SETTING_BLOCK;
+          most_restrictive_setting = CONTENT_SETTING_BLOCK;
           break;
         }
         if (setting == CONTENT_SETTING_ASK)
-          mostRestrictiveSetting = CONTENT_SETTING_ASK;
+          most_restrictive_setting = CONTENT_SETTING_ASK;
       }
     }
-    if (mostRestrictiveSetting == CONTENT_SETTING_ALLOW) {
+    if (most_restrictive_setting == CONTENT_SETTING_ALLOW) {
       radio_group.default_item = 0;
       // |block_setting_| is already set to |CONTENT_SETTING_BLOCK|.
     } else {
       radio_group.default_item = 1;
-      block_setting_ = mostRestrictiveSetting;
+      block_setting_ = most_restrictive_setting;
     }
     selected_item_ = radio_group.default_item;
     set_radio_group(radio_group);
   }
 
   void AddException(ContentSetting setting,
                     const std::string& resource_identifier) {
     if (profile()) {
       profile()->GetHostContentSettingsMap()->AddExceptionForURL(
           bubble_content().radio_group.url,
@@ skipping 255 matching lines @@
       tab_contents_ = NULL;
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED:
       DCHECK(source == Source<Profile>(profile_));
       profile_ = NULL;
       break;
     default:
       NOTREACHED();
   }
 }