chrome/browser/notifications/desktop_notification_service.h - Issue 593153002: Restore the iframe behavior of notification permissions

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.h

Issue 593153002: Restore the iframe behavior of notification permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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/permission_queue_controller.cc ('K') | « chrome/browser/content_settings/permission_queue_controller.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | chrome/browser/notifications/desktop_notification_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notification_service.h

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

index 47457e55926155451f0cae5f83392a5966b33112..22764eb3eef30c9933a881129f55afc54345d431 100644

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

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

@@ -134,6 +134,12 @@ class DesktopNotificationService

const extensions::Extension* extension,

extensions::UninstallReason reason) OVERRIDE;

+ // PermissionContextBase:

+ virtual void UpdateContentSetting(

Peter Beverloo 2014/09/23 15:58:47 nit: we should be able to format this code as: vi

Miguel Garcia 2014/09/23 16:53:39 Done.

+ const GURL& requesting_origin,

+ const GURL& embedder_origin,

+ bool allowed) OVERRIDE;

// The profile which owns this object.

Profile* profile_;