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

Unified Diff: media/gpu/vt_video_encode_accelerator_mac.h

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | media/gpu/vt_video_encode_accelerator_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/vt_video_encode_accelerator_mac.h
diff --git a/content/common/gpu/media/vt_video_encode_accelerator_mac.h b/media/gpu/vt_video_encode_accelerator_mac.h
similarity index 94%
rename from content/common/gpu/media/vt_video_encode_accelerator_mac.h
rename to media/gpu/vt_video_encode_accelerator_mac.h
index dfa180e5741fc017583b9cd3d7b71a36cda0cbb3..c12558cf7b93c0a27ddd3ea029417e739ddb40b5 100644
--- a/content/common/gpu/media/vt_video_encode_accelerator_mac.h
+++ b/media/gpu/vt_video_encode_accelerator_mac.h
@@ -2,23 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
-#define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
+#ifndef MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
+#define MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
#include <memory>
#include "base/mac/scoped_cftyperef.h"
-#include "content/common/content_export.h"
#include "media/base/mac/videotoolbox_glue.h"
#include "media/base/mac/videotoolbox_helpers.h"
+#include "media/gpu/media_gpu_export.h"
#include "media/video/video_encode_accelerator.h"
-namespace content {
+namespace media {
// VideoToolbox.framework implementation of the VideoEncodeAccelerator
// interface for MacOSX. VideoToolbox makes no guarantees that it is thread
// safe, so this object is pinned to the thread on which it is constructed.
-class CONTENT_EXPORT VTVideoEncodeAccelerator
+class MEDIA_GPU_EXPORT VTVideoEncodeAccelerator
: public media::VideoEncodeAccelerator {
public:
VTVideoEncodeAccelerator();
@@ -140,6 +140,6 @@ class CONTENT_EXPORT VTVideoEncodeAccelerator
DISALLOW_COPY_AND_ASSIGN(VTVideoEncodeAccelerator);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
+#endif // MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | media/gpu/vt_video_encode_accelerator_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698