Chromium Code Reviews| Index: media/video/capture/win/video_capture_device_win.h |
| diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h |
| index 1f7e03ace9427b29da1f29a2a5c7a6796c49f0eb..fe467710c13fc4342d10c8a4737a3a8b70394b54 100644 |
| --- a/media/video/capture/win/video_capture_device_win.h |
| +++ b/media/video/capture/win/video_capture_device_win.h |
| @@ -17,8 +17,8 @@ |
| #include <map> |
| #include <string> |
| +#include "base/threading/non_thread_safe.h" |
| #include "base/threading/thread.h" |
| -#include "base/win/scoped_com_initializer.h" |
| #include "base/win/scoped_comptr.h" |
| #include "media/video/capture/video_capture_device.h" |
| #include "media/video/capture/video_capture_types.h" |
| @@ -27,8 +27,10 @@ |
| namespace media { |
| +// All the APIs in the class can only be run on a COM initialized thread. |
|
tommi (sloooow) - chröme
2012/07/04 13:46:48
s/APIs/methods
no longer working on chromium
2012/07/04 14:31:39
Done.
|
| class VideoCaptureDeviceWin |
| - : public VideoCaptureDevice, |
| + : public base::NonThreadSafe, |
| + public VideoCaptureDevice, |
| public SinkFilterObserver { |
| public: |
| explicit VideoCaptureDeviceWin(const Name& device_name); |
| @@ -64,8 +66,6 @@ class VideoCaptureDeviceWin |
| int GetBestMatchedCapability(int width, int height, int frame_rate); |
| void SetErrorState(const char* reason); |
| - base::win::ScopedCOMInitializer initialize_com_; |
| - |
| Name device_name_; |
| InternalState state_; |
| VideoCaptureDevice::EventHandler* observer_; |