chrome/browser/permissions/permission_bubble_request_impl.cc - Issue 2162033002: Revert "Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING 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/permissions/permission_bubble_request_impl.cc

Issue 2162033002: Revert "Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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

« no previous file with comments | « chrome/browser/notifications/notification_permission_context_unittest.cc ('k') | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_bubble_request_impl.cc

diff --git a/chrome/browser/permissions/permission_bubble_request_impl.cc b/chrome/browser/permissions/permission_bubble_request_impl.cc

index 2ae3098f072b4b1bf4ad60ae9b2db7b2a4e4f66f..e2389b16d0db1cafbd280cadd0e362866c5d3875 100644

--- a/chrome/browser/permissions/permission_bubble_request_impl.cc

+++ b/chrome/browser/permissions/permission_bubble_request_impl.cc

@@ -41,7 +41,6 @@ gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const {

return gfx::VectorIconId::LOCATION_ON;

#if defined(ENABLE_NOTIFICATIONS)

case content::PermissionType::NOTIFICATIONS:

- case content::PermissionType::PUSH_MESSAGING:

return gfx::VectorIconId::NOTIFICATIONS;

#endif

#if defined(OS_CHROMEOS)

@@ -69,7 +68,6 @@ int PermissionBubbleRequestImpl::GetIconId() const {

break;

#if defined(ENABLE_NOTIFICATIONS)

case content::PermissionType::NOTIFICATIONS:

- case content::PermissionType::PUSH_MESSAGING:

icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;

break;

#endif

@@ -91,13 +89,15 @@ base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {

break;

#if defined(ENABLE_NOTIFICATIONS)

case content::PermissionType::NOTIFICATIONS:

- case content::PermissionType::PUSH_MESSAGING:

message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;

break;

#endif

case content::PermissionType::MIDI_SYSEX:

message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;

break;

+ case content::PermissionType::PUSH_MESSAGING:

+ message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;

+ break;

#if defined(OS_CHROMEOS)

case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:

message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;