chrome/browser/media/media_stream_infobar_delegate.cc - Issue 1362803002: Add logic to resolve permission mismatches in Android M for webrtc.

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/media_stream_infobar_delegate.cc

Issue 1362803002: Add logic to resolve permission mismatches in Android M for webrtc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add blankline Created 5 years, 3 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/media/media_stream_infobar_delegate.h ('k') | chrome/browser/media/permission_bubble_media_access_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_infobar_delegate.cc

diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc

index 5f0e875c2b2a72ebbe0daf6f4ab3d9919eb2f431..76f6c5305ce0ee4f78e863cfe024a4036125f29e 100644

--- a/chrome/browser/media/media_stream_infobar_delegate.cc

+++ b/chrome/browser/media/media_stream_infobar_delegate.cc

@@ -37,12 +37,7 @@ MediaStreamInfoBarDelegate::~MediaStreamInfoBarDelegate() {

// static

bool MediaStreamInfoBarDelegate::Create(

content::WebContents* web_contents,

- const content::MediaStreamRequest& request,

- const content::MediaResponseCallback& callback) {

- scoped_ptr<MediaStreamDevicesController> controller(

- new MediaStreamDevicesController(web_contents, request, callback));

- if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo())

- return false;

+ scoped_ptr<MediaStreamDevicesController> controller) {

InfoBarService* infobar_service =

InfoBarService::FromWebContents(web_contents);