diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/content_exceptions_table_model.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/content_exceptions_table_model.cc')
| -rw-r--r-- | chrome/browser/content_exceptions_table_model.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc index 84e8c2d..ee92157 100644 --- a/chrome/browser/content_exceptions_table_model.cc +++ b/chrome/browser/content_exceptions_table_model.cc @@ -7,7 +7,7 @@ #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 "chrome/browser/content_settings/host_content_settings_map.h" #include "grit/generated_resources.h" ContentExceptionsTableModel::ContentExceptionsTableModel( @@ -30,7 +30,7 @@ ContentExceptionsTableModel::ContentExceptionsTableModel( ContentExceptionsTableModel::~ContentExceptionsTableModel() {} void ContentExceptionsTableModel::AddException( - const HostContentSettingsMap::Pattern& original_pattern, + const ContentSettingsPattern& original_pattern, ContentSetting setting, bool is_off_the_record) { DCHECK(!is_off_the_record || off_the_record_map_); @@ -38,7 +38,7 @@ void ContentExceptionsTableModel::AddException( int insert_position = is_off_the_record ? RowCount() : static_cast<int>(entries_.size()); - const HostContentSettingsMap::Pattern pattern( + const ContentSettingsPattern pattern( original_pattern.CanonicalizePattern()); entries(is_off_the_record).push_back( @@ -77,14 +77,14 @@ void ContentExceptionsTableModel::RemoveAll() { } int ContentExceptionsTableModel::IndexOfExceptionByPattern( - const HostContentSettingsMap::Pattern& original_pattern, + const ContentSettingsPattern& original_pattern, bool is_off_the_record) { DCHECK(!is_off_the_record || off_the_record_map_); int offset = is_off_the_record ? static_cast<int>(entries_.size()) : 0; - const HostContentSettingsMap::Pattern pattern( + const ContentSettingsPattern pattern( original_pattern.CanonicalizePattern()); // This is called on every key type in the editor. Move to a map if we end up |