| Index: media/capture/video/android/video_capture_device_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_android.h b/media/capture/video/android/video_capture_device_android.h
|
| index ccab5e2a35259552d85c16d543c6dee79e54de82..3416ef27a46ccf3e4b95eb1d0e48c6e1ce4162d0 100644
|
| --- a/media/capture/video/android/video_capture_device_android.h
|
| +++ b/media/capture/video/android/video_capture_device_android.h
|
| @@ -15,6 +15,10 @@
|
| #include "media/base/media_export.h"
|
| #include "media/capture/video/video_capture_device.h"
|
|
|
| +namespace tracked_objects {
|
| +class Location;
|
| +} // namespace tracked_
|
| +
|
| namespace media {
|
|
|
| // VideoCaptureDevice on Android. The VideoCaptureDevice API's are called
|
| @@ -70,7 +74,8 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
| };
|
|
|
| VideoPixelFormat GetColorspace();
|
| - void SetErrorState(const std::string& reason);
|
| + void SetErrorState(const tracked_objects::Location& from_here,
|
| + const std::string& reason);
|
|
|
| // Prevent racing on accessing |state_| and |client_| since both could be
|
| // accessed from different threads.
|
|
|