| Index: content/browser/renderer_host/media/video_capture_controller.h
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
|
| index 2faa29d362431a6bab4f90e686e30aa0f383f304..1d5af25311013656855b517db13f03c5f385f470 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.h
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.h
|
| @@ -39,7 +39,6 @@ class VideoCaptureController
|
| public:
|
| VideoCaptureController(
|
| media_stream::VideoCaptureManager* video_capture_manager);
|
| - virtual ~VideoCaptureController();
|
|
|
| // Start video capturing and try to use the resolution specified in
|
| // |params|.
|
| @@ -74,7 +73,12 @@ class VideoCaptureController
|
| virtual void OnFrameInfo(
|
| const media::VideoCaptureDevice::Capability& info) OVERRIDE;
|
|
|
| + protected:
|
| + virtual ~VideoCaptureController();
|
| +
|
| private:
|
| + friend class base::RefCountedThreadSafe<VideoCaptureController>;
|
| +
|
| struct ControllerClient;
|
| typedef std::list<ControllerClient*> ControllerClients;
|
|
|
| @@ -85,7 +89,6 @@ class VideoCaptureController
|
| void DoIncomingCapturedFrameOnIOThread(int buffer_id, base::Time timestamp);
|
| void DoFrameInfoOnIOThread(const media::VideoCaptureDevice::Capability info);
|
| void DoErrorOnIOThread();
|
| - void DoDeviceStateOnIOThread(bool in_use);
|
| void DoDeviceStoppedOnIOThread();
|
|
|
| // Send frame info and init buffers to |client|.
|
|
|