Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: media/capture/video/video_capture_device.h

Issue 2059493002: Revert of Make media/capture gn and gyps produce components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1f691ef993cb273e55b1434fbabfdfdee428fbf5..ea252424ee5e9eeec2f3d6cbf42965f783d7348f 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -25,9 +25,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 "mojo/public/cpp/bindings/callback.h"
@@ -39,7 +39,7 @@
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 @@
// 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 @@
// 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;
« no previous file with comments | « media/capture/video/mac/video_capture_device_mac.h ('k') | media/capture/video/video_capture_device_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698