chrome/browser/gtk/options/content_filter_page_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_filter_page_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_filter_page_gtk.h ('k') | chrome/browser/plugin_exceptions_table_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 21387a591a77e43c26820e44ee084735edb7c111..d9b06a9eb936cf3d15a8f651776c096c699c2d26 100644

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

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

@@ -6,6 +6,7 @@

#include "app/l10n_util.h"

#include "base/command_line.h"

+#include "chrome/browser/content_settings/content_settings_details.h"

#include "chrome/browser/geolocation/geolocation_content_settings_map.h"

#include "chrome/browser/geolocation/geolocation_exceptions_table_model.h"

#include "chrome/browser/plugin_exceptions_table_model.h"

@@ -278,14 +279,14 @@ void ContentFilterPageGtk::Observe(NotificationType type,

if (type == NotificationType::CONTENT_SETTINGS_CHANGED) {

NotifyContentSettingsChanged(

- Details<HostContentSettingsMap::ContentSettingsDetails>(details).ptr());

+ Details<const ContentSettingsDetails>(details).ptr());

} else {

OptionsPageBase::Observe(type, source, details);

}

void ContentFilterPageGtk::NotifyContentSettingsChanged(

- const HostContentSettingsMap::ContentSettingsDetails *details) {

+ const ContentSettingsDetails *details) {

if (details->type() == CONTENT_SETTINGS_TYPE_DEFAULT ||

details->type() == content_type_) {

ignore_toggle_ = true;