| Index: media/capture/video/video_capture_device.h
|
| diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
|
| index ffdb0b1b65459742c492c96576952b290da2a319..ece443299db7cfe7afc6888e0dd79d4d44812c14 100644
|
| --- a/media/capture/video/video_capture_device.h
|
| +++ b/media/capture/video/video_capture_device.h
|
| @@ -26,9 +26,9 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| +#include "media/base/media_export.h"
|
| #include "media/base/video_capture_types.h"
|
| #include "media/base/video_frame.h"
|
| -#include "media/capture/capture_export.h"
|
| #include "media/capture/video/scoped_result_callback.h"
|
| #include "mojo/public/cpp/bindings/array.h"
|
| #include "ui/gfx/gpu_memory_buffer.h"
|
| @@ -39,7 +39,7 @@ class Location;
|
|
|
| namespace media {
|
|
|
| -class CAPTURE_EXPORT VideoCaptureDevice {
|
| +class MEDIA_EXPORT VideoCaptureDevice {
|
| public:
|
| // Represents a capture device name and ID.
|
| // You should not create an instance of this class directly by e.g. setting
|
| @@ -49,7 +49,7 @@ class CAPTURE_EXPORT VideoCaptureDevice {
|
| // The reason for this is that a device name might contain platform specific
|
| // settings that are relevant only to the platform specific implementation of
|
| // VideoCaptureDevice::Create.
|
| - class CAPTURE_EXPORT Name {
|
| + class MEDIA_EXPORT Name {
|
| public:
|
| Name();
|
| Name(const std::string& name, const std::string& id);
|
| @@ -179,10 +179,10 @@ class CAPTURE_EXPORT VideoCaptureDevice {
|
| // is actually two-in-one: clients may implement OnIncomingCapturedData() or
|
| // ReserveOutputBuffer() + OnIncomingCapturedVideoFrame(), or all of them.
|
| // All clients must implement OnError().
|
| - class CAPTURE_EXPORT Client {
|
| + class MEDIA_EXPORT Client {
|
| public:
|
| // Memory buffer returned by Client::ReserveOutputBuffer().
|
| - class CAPTURE_EXPORT Buffer {
|
| + class MEDIA_EXPORT Buffer {
|
| public:
|
| virtual ~Buffer() = 0;
|
| virtual int id() const = 0;
|
|
|