Chromium Code Reviews| Index: media/video/capture/win/video_capture_device_win.cc |
| diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc |
| index 55b5a16de823698b8bfe091b7b45f45bc2735e42..c941d5c08999499fa1f59361f552554229583b97 100644 |
| --- a/media/video/capture/win/video_capture_device_win.cc |
| +++ b/media/video/capture/win/video_capture_device_win.cc |
| @@ -177,10 +177,10 @@ namespace media { |
| static const char kGoogleCameraAdapter[] = "google camera adapter"; |
| // Gets the names of all video capture devices connected to this computer. |
| +// This API can only be run on a COM initialized thread. |
| void VideoCaptureDevice::GetDeviceNames(Names* device_names) { |
| DCHECK(device_names); |
| - base::win::ScopedCOMInitializer coinit; |
| ScopedComPtr<ICreateDevEnum> dev_enum; |
|
tommi (sloooow) - chröme
2012/07/02 13:36:36
DCHECK(CalledOnValidThread()) first
|
| HRESULT hr = dev_enum.CreateInstance(CLSID_SystemDeviceEnum, NULL, |
| CLSCTX_INPROC); |