chrome/browser/permissions/grouped_permission_infobar_delegate.h - Issue 2250053002: Clean up the PermissionInfoBarDelegate hierarchy.

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

Issue 2250053002: Clean up the PermissionInfoBarDelegate hierarchy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobar-remember-decision

Patch Set: Created 4 years, 4 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_infobar_delegate.cc ('k') | chrome/browser/permissions/grouped_permission_infobar_delegate.cc » ('j') | chrome/browser/permissions/permission_infobar_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/grouped_permission_infobar_delegate.h

diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate.h b/chrome/browser/permissions/grouped_permission_infobar_delegate.h

index f0a22ced3e5f36a28108eeb6af278b9dcfd82d44..59f2ad6ee5cbcdda06865a501eb912ebaacc800e 100644

--- a/chrome/browser/permissions/grouped_permission_infobar_delegate.h

+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate.h

@@ -8,8 +8,8 @@

#include <memory>

#include "base/callback.h"

+#include "chrome/browser/permissions/permission_infobar_delegate.h"

#include "components/content_settings/core/common/content_settings_types.h"

-#include "components/infobars/core/confirm_infobar_delegate.h"

class GURL;

class InfoBarService;

@@ -21,7 +21,7 @@ class InfoBarManager;

// Configures an InfoBar to display a group of permission requests, each of

// which can be allowed or blocked independently.

// TODO(tsergeant): Expand this class so it can be used without subclassing.

-class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {

+class GroupedPermissionInfoBarDelegate : public PermissionInfoBarDelegate {

public:

// Implementation is in platform-specific infobar file.

static std::unique_ptr<infobars::InfoBar> CreateInfoBar(

@@ -36,7 +36,7 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {

base::string16 GetMessageText() const override;

int GetPermissionCount() const;

- ContentSettingsType GetContentSettingType(int index) const;

+ ContentSettingsType GetContentSettingType(int index) const override;

int GetIconIdForPermission(int index) const;

// Message text to display for an individual permission at |index|.

base::string16 GetMessageTextFragment(int index) const;

@@ -54,7 +54,6 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {

// InfoBarDelegate:

Type GetInfoBarType() const override;

- const GURL requesting_origin_;

const std::vector<ContentSettingsType> types_;

std::vector<bool> accept_states_;