chrome/browser/content_settings/permission_infobar_delegate.cc - Issue 1169143003: 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.cc

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

Patch Set: 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/browser/content_settings/permission_infobar_delegate.h ('k') | chrome/browser/media/media_stream_infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_infobar_delegate.cc

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

index 61178273803c180a36aaf1acb47d0581ce61ca69..4ff097560d132fb5cd02d0bf7afb7d8a17c69044 100644

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

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

@@ -34,6 +34,11 @@ void PermissionInfobarDelegate::InfoBarDismissed() {

SetPermission(false, false);

}

+PermissionInfobarDelegate*

+PermissionInfobarDelegate::AsPermissionInfobarDelegate() {

+ return this;

base::string16 PermissionInfobarDelegate::GetButtonLabel(

InfoBarButton button) const {

return l10n_util::GetStringUTF16((button == BUTTON_OK) ?