chrome/browser/content_settings/permission_queue_controller.cc - Issue 785993003: [Push] Register: require user-visible to be present in the manifest

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/content_settings/permission_queue_controller.cc

Issue 785993003: [Push] Register: require user-visible to be present in the manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test after mock behavior change that was recently introduced Created 6 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

« no previous file with comments | « chrome/browser/content_settings/permission_context_base_unittest.cc ('k') | chrome/browser/services/gcm/push_messaging_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_queue_controller.cc

diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc

index 122de959469a394d7ce9fa2ec38c81d63b91ac5e..19048ad48ddb8b7d687bcf938382eede81f20c5a 100644

--- a/chrome/browser/content_settings/permission_queue_controller.cc

+++ b/chrome/browser/content_settings/permission_queue_controller.cc

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

#include "chrome/browser/media/midi_permission_infobar_delegate.h"

#include "chrome/browser/notifications/desktop_notification_infobar_delegate.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h"

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/common/pref_names.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

@@ -121,11 +120,6 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(

GetInfoBarService(id_), controller, id_, requesting_frame_,

display_languages, type_);

break;

- case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:

- infobar_ = gcm::PushMessagingInfoBarDelegate::Create(

- GetInfoBarService(id_), controller, id_, requesting_frame_,

- display_languages, type_);

- break;

#if defined(OS_ANDROID)

case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

infobar_ = ProtectedMediaIdentifierInfoBarDelegate::Create(