chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm - 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/cocoa/infobars/media_stream_infobar_controller.mm

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: Created 8 years, 4 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/browser/media/media_stream_devices_controller.cc ('K') | « chrome/browser/media/media_stream_devices_menu_model.cc ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | content/public/common/media_stream_request.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm

diff --git a/chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm

index cfa564597e302fad77a7f030267aa4fd8421eaff..590eb73911800f6015bfe11361ee81b04b37a385 100644

--- a/chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm

@@ -68,10 +68,8 @@ InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {

// Called when "Allow" button is pressed.

- (void)ok:(id)sender {

std::string audioId, videoId;

- deviceMenuModel_->GetSelectedDeviceId(

- content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audioId);

- deviceMenuModel_->GetSelectedDeviceId(

- content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &videoId);

+ deviceMenuModel_->GetSelectedAudioDeviceId(&audioId);

+ deviceMenuModel_->GetSelectedVideoDeviceId(&videoId);

bool alwaysAllow = deviceMenuModel_->always_allow();

static_cast<MediaStreamInfoBarDelegate*>([self delegate])->Accept(

@@ -138,7 +136,7 @@ InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {

else if (!delegate->HasVideo())

messageId = IDS_MEDIA_CAPTURE_AUDIO_ONLY;

- string16 securityOrigin = UTF8ToUTF16(delegate->GetSecurityOrigin().spec());

+ string16 securityOrigin = UTF8ToUTF16(delegate->GetSecurityOriginSpec());

NSString* text = l10n_util::GetNSStringF(messageId, securityOrigin);

[label1_ setStringValue:text];