chrome/browser/ui/media_stream_infobar_delegate.cc - Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing

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

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Renamed MEDIA_USER_*_CAPTURE to MEDIA_*_DEVICE_CAPTURE, as suggested by wjia@. Created 8 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/ui/media_stream_infobar_delegate.h ('k') | chrome/browser/ui/views/infobars/media_stream_infobar.cc » ('j') | content/browser/renderer_host/media/media_stream_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/media_stream_infobar_delegate.cc

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

index 8c0c4da6c331cf74ca4f2965be98cbaad6f63844..bdedf61dacd57f97a23bd3dee2c94e8986ba8b45 100644

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

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

@@ -38,8 +38,16 @@ content::MediaStreamDevices

return controller_->GetVideoDevices();

}

-const GURL& MediaStreamInfoBarDelegate::GetSecurityOrigin() const {

- return controller_->GetSecurityOrigin();

+const std::string& MediaStreamInfoBarDelegate::GetSecurityOriginSpec() const {

+ return controller_->GetSecurityOriginSpec();

+bool MediaStreamInfoBarDelegate::IsSafeToAlwaysAllowAudio() const {

+ return controller_->IsSafeToAlwaysAllowAudio();

+bool MediaStreamInfoBarDelegate::IsSafeToAlwaysAllowVideo() const {

+ return controller_->IsSafeToAlwaysAllowVideo();

}

void MediaStreamInfoBarDelegate::Accept(const std::string& audio_id,