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

Unified Diff: chrome/browser/media/media_internals.cc

Issue 11273060: Change MediaStreamCaptureIndicator back to ref counted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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/media/media_internals.h ('k') | chrome/browser/media/media_stream_capture_indicator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_internals.cc
diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc
index 3d90cc39607aa3a982ea6ed7406dd5230f8b8f0f..8584ae4ee4fc669fe24678792b5c3b64e24b4faa 100644
--- a/chrome/browser/media/media_internals.cc
+++ b/chrome/browser/media/media_internals.cc
@@ -69,8 +69,6 @@ void MediaInternals::OnCaptureDevicesOpened(
int render_view_id,
const content::MediaStreamDevices& devices) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- if (!media_stream_capture_indicator_.get())
- media_stream_capture_indicator_ = new MediaStreamCaptureIndicator();
media_stream_capture_indicator_->CaptureDevicesOpened(render_process_id,
render_view_id,
devices);
@@ -113,7 +111,14 @@ void MediaInternals::SendEverything() {
SendUpdate("media.onReceiveEverything", &data_);
}
-MediaInternals::MediaInternals() {}
+scoped_refptr<MediaStreamCaptureIndicator>
+MediaInternals::GetMediaStreamCaptureIndicator() {
+ return media_stream_capture_indicator_.get();
+}
+
+MediaInternals::MediaInternals()
+ : media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
+}
void MediaInternals::UpdateAudioStream(
void* host, int stream_id, const std::string& property, Value* value) {
« no previous file with comments | « chrome/browser/media/media_internals.h ('k') | chrome/browser/media/media_stream_capture_indicator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698