chrome/browser/content_settings/permission_infobar_delegate.h - Issue 1164973003: Add initial support for runtime permissions in android M.

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

Issue 1164973003: Add initial support for runtime permissions in android M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Appease findbugs Created 5 years, 6 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/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java ('k') | chrome/browser/content_settings/permission_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_infobar_delegate.h

diff --git a/chrome/browser/content_settings/permission_infobar_delegate.h b/chrome/browser/content_settings/permission_infobar_delegate.h

index 25bb0b4caefba4d6c88786e879298d5ccee8b4ca..519fbcaa28ef21276a23544176419a7f7147976a 100644

--- a/chrome/browser/content_settings/permission_infobar_delegate.h

+++ b/chrome/browser/content_settings/permission_infobar_delegate.h

@@ -20,6 +20,9 @@ class PermissionQueueController;

// provide an icon and a message text to the infobar.

class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {

+ public:

+ ContentSettingsType content_setting() const { return type_; }

protected:

PermissionInfobarDelegate(PermissionQueueController* controller,

const PermissionRequestID& id,

@@ -31,6 +34,7 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {

// ConfirmInfoBarDelegate:

Type GetInfoBarType() const override;

void InfoBarDismissed() override;

+ PermissionInfobarDelegate* AsPermissionInfobarDelegate() override;

base::string16 GetButtonLabel(InfoBarButton button) const override;

bool Accept() override;

bool Cancel() override;