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..5720410c419c72398055c1459b7276ff3fa783ef 100644 |
--- a/media/video/capture/win/video_capture_device_win.h |
+++ b/media/video/capture/win/video_capture_device_win.h |
@@ -18,7 +18,6 @@ |
#include <string> |
#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,6 +26,7 @@ |
namespace media { |
+// All the APIs in the class can only be run on a COM initialized thread. |
class VideoCaptureDeviceWin |
tommi (sloooow) - chröme
2012/07/02 13:36:36
inherit from base::NonThreadSafe and use CalledOnV
no longer working on chromium
2012/07/04 12:35:25
Done.
|
: public VideoCaptureDevice, |
public SinkFilterObserver { |
@@ -64,8 +64,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_; |