Media Related changes for TabCapture API

chrome/browser/media/media_internals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_internals.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/media/media_internals_observer.h"
@@ skipping 56 matching lines @@
 void MediaInternals::OnCaptureDevicesOpened(
     int render_process_id,
     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);
+
+  for (content::MediaStreamDevices::const_iterator it = devices.begin();
+    it != devices.end(); ++it) {
+    OnMediaRequestStateChange(render_process_id, render_view_id, *it,

[no longer working on chromium, 2012/10/04 18:41:49]

Do we send the StateChange notification for all the opened/closed devices?
And how the extensions figure out if those devices are what they are interested
in?

[justinlin, 2012/10/08 08:59:45]

The extension will listen to all the TAB_MEDIA type stream changes. Actually,
only VIDEO_TAB_MEDIA right now since audio is not ready yet and otherwise we
will get dupes. Moved this loop back into media_stream_manager.cc

+      content::MediaStreamRequest::STATE_OPENING);
+  }
 }
 
 void MediaInternals::OnCaptureDevicesClosed(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   media_stream_capture_indicator_->CaptureDevicesClosed(render_process_id,
                                                         render_view_id,
                                                         devices);
+
+  for (content::MediaStreamDevices::const_iterator it = devices.begin();
+    it != devices.end(); ++it) {
+    OnMediaRequestStateChange(render_process_id, render_view_id, *it,
+      content::MediaStreamRequest::STATE_ERROR);
+  }
+}
+
+void MediaInternals::OnMediaRequestStateChange(

[no longer working on chromium, 2012/10/04 18:41:49]

OnMediaRequestStateChanged

[justinlin, 2012/10/08 08:59:45]

Done.

+    int render_process_id,
+    int render_view_id,
+    const content::MediaStreamDevice& device,
+    const content::MediaStreamRequest::RequestState state) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (observers_.size()) {
+    FOR_EACH_OBSERVER(MediaInternalsObserver, observers_,
+                      OnRequestUpdate(device, state));
+  }
 }
 
 void MediaInternals::AddObserver(MediaInternalsObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_.AddObserver(observer);
 }
 
 void MediaInternals::RemoveObserver(MediaInternalsObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_.RemoveObserver(observer);
@@ skipping 34 matching lines @@
 
 void MediaInternals::SendUpdate(const std::string& function, Value* value) {
   // Only bother serializing the update to JSON if someone is watching.
   if (observers_.size()) {
     std::vector<const Value*> args;
     args.push_back(value);
     string16 update = content::WebUI::GetJavascriptCall(function, args);
     FOR_EACH_OBSERVER(MediaInternalsObserver, observers_, OnUpdate(update));
   }
 }