chrome/browser/notifications/notification_exceptions_table_model.cc - Issue 7831075: Delegating the "are images allowed" decision to renderer.

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/notifications/notification_exceptions_table_model.cc

Issue 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: More code review comments. Created 9 years, 3 months 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/host_content_settings_map.cc ('K') | « chrome/browser/notifications/desktop_notification_service_unittest.cc ('k') | chrome/browser/notifications/notification_exceptions_table_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_exceptions_table_model.cc

diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc

index f147af579778b94e164aaa2a38a0586636d1abd6..a4b1d1f88575ad4faa70e25ff3392a808c9cd39f 100644

--- a/chrome/browser/notifications/notification_exceptions_table_model.cc

+++ b/chrome/browser/notifications/notification_exceptions_table_model.cc

@@ -116,15 +116,15 @@ void NotificationExceptionsTableModel::Observe(

}

void NotificationExceptionsTableModel::LoadEntries() {

- HostContentSettingsMap::SettingsForOneType settings;

+ ContentSettingsForOneType settings;

service_->GetNotificationsSettings(&settings);

entries_.reserve(settings.size());

- for (HostContentSettingsMap::SettingsForOneType::const_iterator i =

+ for (ContentSettingsForOneType::const_iterator i =

settings.begin();

i != settings.end();

++i) {

- const HostContentSettingsMap::PatternSettingSourceTuple& tuple(*i);

+ const ContentSettingPatternSourceTuple& tuple(*i);

entries_.push_back(Entry(tuple.a, tuple.c));

}

std::sort(entries_.begin(), entries_.end());