Index: services/ui/gpu/gpu_service.h |
diff --git a/services/ui/gpu/gpu_service.h b/services/ui/gpu/gpu_service.h |
index f2978fe0d24e844945ff33ba8353903d775f2a3a..ae45e553c02bea00d5d318c62163341784e7fd57 100644 |
--- a/services/ui/gpu/gpu_service.h |
+++ b/services/ui/gpu/gpu_service.h |
@@ -19,7 +19,6 @@ |
#include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
#include "gpu/ipc/service/gpu_config.h" |
#include "gpu/ipc/service/x_util.h" |
-#include "mojo/public/cpp/bindings/binding.h" |
#include "mojo/public/cpp/bindings/binding_set.h" |
#include "services/ui/gpu/interfaces/gpu_host.mojom.h" |
#include "services/ui/gpu/interfaces/gpu_service.mojom.h" |
@@ -53,9 +52,18 @@ class GpuService : public gpu::GpuChannelManagerDelegate, |
~GpuService() override; |
- void InitializeWithHost(mojom::GpuHostPtr gpu_host); |
+ void InitializeWithHost(mojom::GpuHostPtr gpu_host, |
+ const gpu::GpuPreferences& preferences); |
void Bind(mojom::GpuServiceRequest request); |
+ media::MediaGpuChannelManager* media_gpu_channel_manager() { |
+ return media_gpu_channel_manager_.get(); |
+ } |
+ |
+ gpu::GpuChannelManager* gpu_channel_manager() { |
+ return gpu_channel_manager_.get(); |
+ } |
+ |
private: |
friend class GpuMain; |