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

Unified Diff: media/gpu/generic_v4l2_device.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/fake_video_decode_accelerator.cc ('k') | media/gpu/generic_v4l2_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/generic_v4l2_device.h
diff --git a/content/common/gpu/media/generic_v4l2_device.h b/media/gpu/generic_v4l2_device.h
similarity index 88%
rename from content/common/gpu/media/generic_v4l2_device.h
rename to media/gpu/generic_v4l2_device.h
index a5f787b0ee089d077c2ef8b5b482baf619173d05..180e2e35a40f1a4f54268374b6d8ce7275f81bd0 100644
--- a/content/common/gpu/media/generic_v4l2_device.h
+++ b/media/gpu/generic_v4l2_device.h
@@ -5,17 +5,17 @@
// This file contains the implementation of GenericV4L2Device used on
// platforms, which provide generic V4L2 video codec devices.
-#ifndef CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_
-#define CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_
+#ifndef MEDIA_GPU_GENERIC_V4L2_DEVICE_H_
+#define MEDIA_GPU_GENERIC_V4L2_DEVICE_H_
#include <stddef.h>
#include <stdint.h>
#include "base/files/scoped_file.h"
#include "base/macros.h"
-#include "content/common/gpu/media/v4l2_device.h"
+#include "media/gpu/v4l2_device.h"
-namespace content {
+namespace media {
class GenericV4L2Device : public V4L2Device {
public:
@@ -73,6 +73,6 @@ class GenericV4L2Device : public V4L2Device {
// init failure.
static bool PostSandboxInitialization();
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_
+#endif // MEDIA_GPU_GENERIC_V4L2_DEVICE_H_
« no previous file with comments | « media/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/generic_v4l2_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698