chrome/browser/gtk/options/content_exceptions_window_gtk.cc - Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/gtk/options/content_exceptions_window_gtk.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

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/gtk/options/content_exceptions_window_gtk.h ('k') | chrome/browser/gtk/options/content_exceptions_window_gtk_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/gtk/options/content_exceptions_window_gtk.cc

diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc

index 5c8cdfde8b944182ddce7d354bbec34ea453b715..6a1fc8832383cc6a5e428ccf139ed63053a9ffe5 100644

--- a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc

+++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc

@@ -199,7 +199,7 @@ void ContentExceptionsWindowGtk::SetColumnValues(int row, GtkTreeIter* iter) {

}

void ContentExceptionsWindowGtk::AcceptExceptionEdit(

- const HostContentSettingsMap::Pattern& pattern,

+ const ContentSettingsPattern& pattern,

ContentSetting setting,

bool is_off_the_record,

int index,

@@ -235,7 +235,7 @@ void ContentExceptionsWindowGtk::UpdateButtonState() {

void ContentExceptionsWindowGtk::Add(GtkWidget* widget) {

new ContentExceptionEditor(GTK_WINDOW(dialog_),

this, model_.get(), allow_off_the_record_, -1,

- HostContentSettingsMap::Pattern(),

+ ContentSettingsPattern(),

CONTENT_SETTING_BLOCK, false);

}