Add a single site view page to view and modify content settings.

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 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/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 250 matching lines @@
     // one rule for the default setting. Get the rule that currently defines
     // the permission for the given permission |type|. Then test whether the
     // existing rule is more specific than the rule we are about to create. If
     // the existing rule is more specific, than change the existing rule instead
     // of creating a new rule that would be hidden behind the existing rule.
     // This is not a concern for CONTENT_SETTINGS_TYPE_MEDIASTREAM since users
     // can not create media settings exceptions by hand.
     content_settings::SettingInfo info;
     scoped_ptr<base::Value> v(content_settings_->GetWebsiteSetting(
         site_url_, site_url_, type, std::string(), &info));
-    DCHECK(info.source == content_settings::SETTING_SOURCE_USER);
-    ContentSettingsPattern::Relation r1 =
-        info.primary_pattern.Compare(primary_pattern);
-    DCHECK(r1 != ContentSettingsPattern::DISJOINT_ORDER_POST &&
-           r1 != ContentSettingsPattern::DISJOINT_ORDER_PRE);
-    if (r1 == ContentSettingsPattern::PREDECESSOR) {
-      primary_pattern = info.primary_pattern;
-    } else if (r1 == ContentSettingsPattern::IDENTITY) {
-      ContentSettingsPattern::Relation r2 =
-          info.secondary_pattern.Compare(secondary_pattern);
-      DCHECK(r2 != ContentSettingsPattern::DISJOINT_ORDER_POST &&
-             r2 != ContentSettingsPattern::DISJOINT_ORDER_PRE);
-      if (r2 == ContentSettingsPattern::PREDECESSOR)
-        secondary_pattern = info.secondary_pattern;
-    }
-
+    content_settings_->SetNarrowestWebsiteSetting(
+        primary_pattern, secondary_pattern, type, std::string(), setting, info);
+  } else {
     base::Value* value = NULL;
     if (setting != CONTENT_SETTING_DEFAULT)
       value = new base::FundamentalValue(setting);
     content_settings_->SetWebsiteSetting(
         primary_pattern, secondary_pattern, type, std::string(), value);
   }
 
   show_info_bar_ = true;
 
 // TODO(markusheintz): This is a temporary hack to fix issue:
@@ skipping 431 matching lines @@
   if (visited_before_today) {
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
   }
   ui_->SetFirstVisit(first_visit_text);
 }