Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: chrome/browser/ui/media_stream_infobar_delegate.cc

Issue 10692174: Use reference instead of pointer for media stream device request (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 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
Index: chrome/browser/ui/media_stream_infobar_delegate.cc
===================================================================
--- chrome/browser/ui/media_stream_infobar_delegate.cc (revision 146197)
+++ chrome/browser/ui/media_stream_infobar_delegate.cc (working copy)
@@ -37,12 +37,11 @@
const content::MediaStreamRequest* request,
const content::MediaResponseCallback& callback)
: InfoBarDelegate(tab_helper),
- request_(request),
+ request_(*request),
callback_(callback) {
- DCHECK(request_);
- has_audio_ = request_->devices.count(
+ has_audio_ = request_.devices.count(
content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) != 0;
- has_video_ = request_->devices.count(
+ has_video_ = request_.devices.count(
content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE) != 0;
}
@@ -54,8 +53,8 @@
if (!has_audio_)
return content::MediaStreamDevices();
content::MediaStreamDeviceMap::const_iterator it =
- request_->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE);
- DCHECK(it != request_->devices.end());
+ request_.devices.find(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE);
+ DCHECK(it != request_.devices.end());
return it->second;
}
@@ -64,13 +63,13 @@
if (!has_video_)
return content::MediaStreamDevices();
content::MediaStreamDeviceMap::const_iterator it =
- request_->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
- DCHECK(it != request_->devices.end());
+ request_.devices.find(content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
+ DCHECK(it != request_.devices.end());
return it->second;
}
const GURL& MediaStreamInfoBarDelegate::GetSecurityOrigin() const {
- return request_->security_origin;
+ return request_.security_origin;
}
void MediaStreamInfoBarDelegate::Accept(const std::string& audio_id,
@@ -99,8 +98,8 @@
content::MediaStreamDevices* devices) {
DCHECK(devices);
content::MediaStreamDeviceMap::const_iterator device_it =
- request_->devices.find(type);
- if (device_it != request_->devices.end()) {
+ request_.devices.find(type);
+ if (device_it != request_.devices.end()) {
content::MediaStreamDevices::const_iterator it = std::find_if(
device_it->second.begin(), device_it->second.end(), DeviceIdEquals(id));
if (it != device_it->second.end())

Powered by Google App Engine
This is Rietveld 408576698