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

Unified Diff: chrome/browser/gtk/options/content_exception_editor.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/gtk/options/content_exception_editor.cc
diff --git a/chrome/browser/gtk/options/content_exception_editor.cc b/chrome/browser/gtk/options/content_exception_editor.cc
index 144bf84226ae01b606428953e6bfda8e25fed01a..5f8aa691af75b59bed9efd139af692dc1484bf95 100644
--- a/chrome/browser/gtk/options/content_exception_editor.cc
+++ b/chrome/browser/gtk/options/content_exception_editor.cc
@@ -21,7 +21,7 @@ ContentExceptionEditor::ContentExceptionEditor(
ContentExceptionsTableModel* model,
bool allow_off_the_record,
int index,
- const HostContentSettingsMap::Pattern& pattern,
+ const ContentSettingsPattern& pattern,
ContentSetting setting,
bool is_off_the_record)
: delegate_(delegate),
@@ -91,7 +91,7 @@ ContentExceptionEditor::ContentExceptionEditor(
}
bool ContentExceptionEditor::IsPatternValid(
- const HostContentSettingsMap::Pattern& pattern,
+ const ContentSettingsPattern& pattern,
bool is_off_the_record) const {
bool is_valid_pattern = pattern.IsValid() &&
(model_->IndexOfExceptionByPattern(pattern, is_off_the_record) == -1);
@@ -107,8 +107,7 @@ void ContentExceptionEditor::UpdateImage(GtkWidget* image, bool is_valid) {
}
void ContentExceptionEditor::OnEntryChanged(GtkWidget* entry) {
- HostContentSettingsMap::Pattern new_pattern(
- gtk_entry_get_text(GTK_ENTRY(entry)));
+ ContentSettingsPattern new_pattern(gtk_entry_get_text(GTK_ENTRY(entry)));
bool is_off_the_record =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(otr_checkbox_));
bool is_valid = IsPatternValid(new_pattern, is_off_the_record);
@@ -120,8 +119,7 @@ void ContentExceptionEditor::OnEntryChanged(GtkWidget* entry) {
void ContentExceptionEditor::OnResponse(GtkWidget* sender, int response_id) {
if (response_id == GTK_RESPONSE_OK) {
// Notify our delegate to update everything.
- HostContentSettingsMap::Pattern new_pattern(
- gtk_entry_get_text(GTK_ENTRY(entry_)));
+ ContentSettingsPattern new_pattern(gtk_entry_get_text(GTK_ENTRY(entry_)));
ContentSetting setting = cb_model_.SettingForIndex(
gtk_combo_box_get_active(GTK_COMBO_BOX(action_combo_)));
bool is_off_the_record =

Powered by Google App Engine
This is Rietveld 408576698