chrome/browser/ui/views/infobars/media_stream_infobar.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/views/infobars/media_stream_infobar.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: Add MediaStreamDispatcher IPC glue (and unittests) for new GenerateStreamForDevice() API. 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.cc ('k') | content/browser/browser_main_loop.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/views/infobars/media_stream_infobar.cc

diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.cc b/chrome/browser/ui/views/infobars/media_stream_infobar.cc

index 19d35a6bf33ca94c2af0f59d73bc77b1927cfce9..7e0f0b29c30358ffa15a040cf42261becd19b5dd 100644

--- a/chrome/browser/ui/views/infobars/media_stream_infobar.cc

+++ b/chrome/browser/ui/views/infobars/media_stream_infobar.cc

@@ -70,7 +70,7 @@ void MediaStreamInfoBar::ViewHierarchyChanged(bool is_add,

message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;

label_ = CreateLabel(l10n_util::GetStringFUTF16(message_id,

- UTF8ToUTF16(GetDelegate()->GetSecurityOrigin().spec())));

+ UTF8ToUTF16(GetDelegate()->GetSecurityOriginSpec())));

AddChildView(label_);

allow_button_ = CreateTextButton(this,

@@ -97,10 +97,8 @@ void MediaStreamInfoBar::ButtonPressed(views::Button* sender,

return; // We're closing; don't call anything, it might access the owner.

if (sender == allow_button_) {

std::string audio_id, video_id;

- devices_menu_model_.GetSelectedDeviceId(

- content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audio_id);

- devices_menu_model_.GetSelectedDeviceId(

- content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &video_id);

+ devices_menu_model_.GetSelectedAudioDeviceId(&audio_id);

+ devices_menu_model_.GetSelectedAudioDeviceId(&video_id);

bool always_allow = devices_menu_model_.always_allow();

GetDelegate()->Accept(audio_id, video_id, always_allow);

RemoveSelf();