diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 11:14:09 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 11:14:09 +0000 |
commit | ca352454df9a2c6dac0dd5927c92d73d4eee069d (patch) | |
tree | f8eae8e9d64812c7b284415fcb6ee11cc1aff9fc /chrome/browser/content_exceptions_table_model.cc | |
parent | dc3d06cd952e621bf64f3abe46e1c3eaa6598064 (diff) | |
download | chromium_src-ca352454df9a2c6dac0dd5927c92d73d4eee069d.zip chromium_src-ca352454df9a2c6dac0dd5927c92d73d4eee069d.tar.gz chromium_src-ca352454df9a2c6dac0dd5927c92d73d4eee069d.tar.bz2 |
Introduce a resource identifier for content settings.
This will allow for having per plugin content settings, i.e. the content settings type would be plugin and the resource identifier would be to concrete plugin that is about to be loaded.
BUG=39252
TEST=unit_tests
Review URL: http://codereview.chromium.org/2878075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_exceptions_table_model.cc')
-rw-r--r-- | chrome/browser/content_exceptions_table_model.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc index d7f1bb6..e8bb22f 100644 --- a/chrome/browser/content_exceptions_table_model.cc +++ b/chrome/browser/content_exceptions_table_model.cc @@ -19,9 +19,12 @@ ContentExceptionsTableModel::ContentExceptionsTableModel( 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( @@ -35,7 +38,10 @@ void ContentExceptionsTableModel::AddException( 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); } @@ -47,7 +53,7 @@ void ContentExceptionsTableModel::RemoveException(int 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_) |