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

Unified Diff: content/gpu/gpu_child_thread.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 | « content/gpu/BUILD.gn ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 2617d647630e8024a959855695367efcd7bb23be..5b3b44e2f90092ad30bbbb3e604eaf4b71320440 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -34,6 +34,10 @@ class GpuMemoryBufferFactory;
class SyncPointManager;
}
+namespace media {
+class MediaService;
+}
+
namespace sandbox {
class TargetServices;
}
@@ -41,7 +45,6 @@ class TargetServices;
namespace content {
class GpuProcessControlImpl;
class GpuWatchdogThread;
-class MediaService;
struct EstablishChannelParams;
#if defined(OS_MACOSX)
struct BufferPresentedParams;
@@ -163,7 +166,7 @@ class GpuChildThread : public ChildThreadImpl,
std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
- std::unique_ptr<MediaService> media_service_;
+ std::unique_ptr<media::MediaService> media_service_;
// Information about the GPU, such as device and vendor ID.
gpu::GPUInfo gpu_info_;
« no previous file with comments | « content/gpu/BUILD.gn ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698