chrome/browser/notifications/desktop_notification_service.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/desktop_notification_service.cc

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

Patch Set: Doc fix. Created 9 years, 2 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:

Index: chrome/browser/notifications/desktop_notification_service.cc

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

index ca4857d9b2ad225f111aa45a87673274a5f48ac9..4a43f941eee3cee8cf08d29f4b062f9fcf2807b7 100644

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

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

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

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/content_settings.h"

#include "chrome/common/content_settings_pattern.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

@@ -292,7 +293,7 @@ void DesktopNotificationService::ResetToDefaultContentSetting() {

}

void DesktopNotificationService::GetNotificationsSettings(

- HostContentSettingsMap::SettingsForOneType* settings) {

+ ContentSettingsForOneType* settings) {

profile_->GetHostContentSettingsMap()->GetSettingsForOneType(

CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

NO_RESOURCE_IDENTIFIER,