Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / media / media_capture_devices_dispatcher.h

diff --git a/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h b/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
index 351170a..b56fce7 100644 (file)
--- a/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
+++ b/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
@@ -35,8 +35,8 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
     // Handle an information update related to a media stream request.
     virtual void OnRequestUpdate(
         int render_process_id,
-        int render_view_id,
-        const content::MediaStreamDevice& device,
+        int render_frame_id,
+        content::MediaStreamType stream_type,
         const content::MediaRequestState state) {}
 
     virtual ~Observer() {}
@@ -72,22 +72,13 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
   virtual void OnVideoCaptureDevicesChanged() OVERRIDE;
   virtual void OnMediaRequestStateChanged(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       int page_request_id,
       const GURL& security_origin,
-      const content::MediaStreamDevice& device,
+      content::MediaStreamType stream_type,
       content::MediaRequestState state) OVERRIDE;
   virtual void OnCreatingAudioStream(int render_process_id,
                                      int render_view_id) OVERRIDE {}
-  virtual void OnAudioStreamPlaying(
-      int render_process_id,
-      int render_frame_id,
-      int stream_id,
-      const ReadPowerAndClipCallback& power_read_callback) OVERRIDE {}
-  virtual void OnAudioStreamStopped(
-      int render_process_id,
-      int render_frame_id,
-      int stream_id) OVERRIDE {}
 
   // Only for testing.
   void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices);
@@ -104,9 +95,9 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
   void NotifyVideoDevicesChangedOnUIThread();
   void UpdateMediaReqStateOnUIThread(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const GURL& security_origin,
-      const content::MediaStreamDevice& device,
+      content::MediaStreamType stream_type,
       content::MediaRequestState state);
 
   // Only for testing, a list of cached audio capture devices.