Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4921)

Unified Diff: chrome/browser/content_exceptions_table_model.cc

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings
Patch Set: updates Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_exceptions_table_model.cc
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc
index c45177cc41739fe51c7f0ebc776f525b6ce503c9..ee9215721770749acb3e0c81123b8bf377f52327 100644
--- a/chrome/browser/content_exceptions_table_model.cc
+++ b/chrome/browser/content_exceptions_table_model.cc
@@ -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

Powered by Google App Engine
This is Rietveld 408576698