Introduce a resource identifier for content settings.

chrome/browser/content_exceptions_table_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_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "grit/generated_resources.h"
 
 ContentExceptionsTableModel::ContentExceptionsTableModel(
     HostContentSettingsMap* map,
     HostContentSettingsMap* off_the_record_map,
     ContentSettingsType type)
     : map_(map),
       off_the_record_map_(off_the_record_map),
       content_type_(type),
       observer_(NULL) {
   // Load the contents.
-  map->GetSettingsForOneType(type, &entries_);
-  if (off_the_record_map)
-    off_the_record_map->GetSettingsForOneType(type, &off_the_record_entries_);
+  map->GetSettingsForOneType(type, "", &entries_);
+  if (off_the_record_map) {
+    off_the_record_map->GetSettingsForOneType(type,
+                                              "",
+                                              &off_the_record_entries_);
+  }
 }
 
 void ContentExceptionsTableModel::AddException(
     const HostContentSettingsMap::Pattern& pattern,
     ContentSetting setting,
     bool is_off_the_record) {
   DCHECK(!is_off_the_record || off_the_record_map_);
 
   int insert_position =
       is_off_the_record ? RowCount() : static_cast<int>(entries_.size());
 
   entries(is_off_the_record).push_back(
       HostContentSettingsMap::PatternSettingPair(pattern, setting));
-  map(is_off_the_record)->SetContentSetting(pattern, content_type_, setting);
+  map(is_off_the_record)->SetContentSetting(pattern,
+                                            content_type_,
+                                            "",
+                                            setting);
   if (observer_)
     observer_->OnItemsAdded(insert_position, 1);
 }
 
 void ContentExceptionsTableModel::RemoveException(int row) {
   bool is_off_the_record = entry_is_off_the_record(row);
   int position_to_delete =
       is_off_the_record ? row - static_cast<int>(entries_.size()) : row;
   const HostContentSettingsMap::PatternSettingPair& pair = entry_at(row);
 
   map(is_off_the_record)->SetContentSetting(
-      pair.first, content_type_, CONTENT_SETTING_DEFAULT);
+      pair.first, content_type_, "", CONTENT_SETTING_DEFAULT);
   entries(is_off_the_record).erase(
       entries(is_off_the_record).begin() + position_to_delete);
   if (observer_)
     observer_->OnItemsRemoved(row, 1);
 }
 
 void ContentExceptionsTableModel::RemoveAll() {
   int old_row_count = RowCount();
   entries_.clear();
   off_the_record_entries_.clear();
@@ skipping 50 matching lines @@
     default:
       NOTREACHED();
   }
 
   return std::wstring();
 }
 
 void ContentExceptionsTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }