chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm - Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

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 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed sky's comment and replaced "Do not allow any site to" with "Do not allow sites to" Created 8 years, 6 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/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm ('k') | chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc » ('j') | no next file with comments »
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 cfdd5ee8221a893aad26fce594fffefa273d779d..2bcc58de65678e8b0224391fe1aa393844b427b2 100644

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

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

@@ -100,9 +100,10 @@ void SizeAndPlaceControl(NSView* toModify, NSView* anchor, bool after) {

content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audioId);

deviceMenuModel_->GetSelectedDeviceId(

content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &videoId);

+ bool alwaysAllow = deviceMenuModel_->always_allow();

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

- videoId);

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

+ audioId, videoId, alwaysAllow);

// Remove the infobar, we're done.

[super removeSelf];

@@ -165,12 +166,12 @@ void SizeAndPlaceControl(NSView* toModify, NSView* anchor, bool after) {

// Get the requested media type(s) and add corresponding text to the text

// field.

- int messageId = IDS_MEDIA_CAPTURE_MIC_AND_VIDEO;

- DCHECK(delegate->has_audio() || delegate->has_video());

- if (!delegate->has_audio())

+ int messageId = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;

+ DCHECK(delegate->HasAudio() || delegate->HasVideo());

+ if (!delegate->HasAudio())

messageId = IDS_MEDIA_CAPTURE_VIDEO_ONLY;

- else if (!delegate->has_video())

- messageId = IDS_MEDIA_CAPTURE_MIC_ONLY;

+ else if (!delegate->HasVideo())

+ messageId = IDS_MEDIA_CAPTURE_AUDIO_ONLY;

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

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