Media Related changes for TabCapture API

content/renderer/media/media_stream_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceMediaRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h"
 #include "webkit/media/media_stream_client.h"
 
 namespace WebKit {
 class WebMediaStreamDescriptor;
 }
 
 class MediaStreamDispatcher;
 class MediaStreamDependencyFactory;
 class VideoCaptureImplManager;
@@ skipping 18 matching lines @@
       VideoCaptureImplManager* vc_manager,
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
   // WebKit::WebUserMediaClient implementation
   virtual void requestUserMedia(
       const WebKit::WebUserMediaRequest& user_media_request,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
       OVERRIDE;
+  virtual void requestDeviceMedia(
+      const WebKit::WebDeviceMediaRequest& user_media_request) OVERRIDE;
   virtual void cancelUserMediaRequest(
       const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
 
   // webkit_media::MediaStreamClient implementation.
   virtual bool IsMediaStream(const GURL& url) OVERRIDE;
   virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
       const GURL& url,
       const base::Closure& error_cb,
       const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
   virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
@@ skipping 68 matching lines @@
       webrtc::MediaStreamInterface* stream,
       const base::Closure& error_cb,
       const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb);
   scoped_refptr<media::VideoDecoder> CreateLocalVideoDecoder(
       webrtc::MediaStreamInterface* stream,
       media::MessageLoopFactory* message_loop_factory);
   scoped_refptr<media::VideoDecoder> CreateRemoteVideoDecoder(
       webrtc::MediaStreamInterface* stream,
       media::MessageLoopFactory* message_loop_factory);
 
+  void GenerateStreamForMedia(
+      const WebKit::WebUserMediaRequest& user_media_request,
+      const content::MediaStreamDeviceType audio,
+      const content::MediaStreamDeviceType video,
+      const std::string* device_id);
+
   // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
   // It's valid for the lifetime of RenderThread.
   MediaStreamDependencyFactory* dependency_factory_;
 
   // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
   // valid for the lifetime of RenderView.
   MediaStreamDispatcher* media_stream_dispatcher_;
 
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   MediaRequestMap user_media_requests_;
   LocalNativeStreamMap local_media_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_