chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h - Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars

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/media/webrtc/media_stream_infobar_delegate_android.h

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)

Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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

« chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('K') | « chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc ('k') | chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc » ('j') | chrome/browser/ui/android/infobars/permission_infobar.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h

diff --git a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h

index 8eccb837a652a85d0f3ebcd8dd038093c7f343fd..99badacf965cf24033989d012fb813e92b7c1842 100644

--- a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h

+++ b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h

@@ -48,7 +48,7 @@ class MediaStreamInfoBarDelegateAndroid : public PermissionInfoBarDelegate {

base::string16 GetLinkText() const override;

GURL GetLinkURL() const override;

int GetMessageResourceId() const override;

- std::vector<int> content_settings() const override;

+ std::vector<int> permission_types() const override;

std::unique_ptr<MediaStreamDevicesController> controller_;