Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 5 #ifndef SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 
| 6 #define SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 6 #define SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 
| 7 | 7 | 
| 8 #include "base/callback.h" | 8 #include "base/callback.h" | 
| 9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" | 
| 10 #include "base/threading/non_thread_safe.h" | 10 #include "base/threading/non_thread_safe.h" | 
| 11 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" | 
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" | 
| 13 #include "gpu/command_buffer/service/gpu_preferences.h" | 13 #include "gpu/command_buffer/service/gpu_preferences.h" | 
| 14 #include "gpu/config/gpu_info.h" | 14 #include "gpu/config/gpu_info.h" | 
| 15 #include "gpu/ipc/common/surface_handle.h" | 15 #include "gpu/ipc/common/surface_handle.h" | 
| 16 #include "gpu/ipc/service/gpu_channel.h" | 16 #include "gpu/ipc/service/gpu_channel.h" | 
| 17 #include "gpu/ipc/service/gpu_channel_manager.h" | 17 #include "gpu/ipc/service/gpu_channel_manager.h" | 
| 18 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 18 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 
| 19 #include "gpu/ipc/service/gpu_config.h" | 19 #include "gpu/ipc/service/gpu_config.h" | 
| 20 #include "gpu/ipc/service/x_util.h" | 20 #include "gpu/ipc/service/x_util.h" | 
| 21 #include "mojo/public/cpp/bindings/strong_binding.h" | 21 #include "mojo/public/cpp/bindings/binding_set.h" | 
| 22 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h" | 22 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h" | 
| 23 #include "ui/gfx/native_widget_types.h" | 23 #include "ui/gfx/native_widget_types.h" | 
| 24 | 24 | 
| 25 namespace base { | 25 namespace base { | 
| 26 template <typename T> | 26 template <typename T> | 
| 27 struct DefaultSingletonTraits; | 27 struct DefaultSingletonTraits; | 
| 28 } | 28 } | 
| 29 | 29 | 
| 30 namespace gpu { | 30 namespace gpu { | 
| 31 class GpuChannelHost; | 31 class GpuChannelHost; | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 | 146 | 
| 147 std::unique_ptr<media::MediaService> media_service_; | 147 std::unique_ptr<media::MediaService> media_service_; | 
| 148 | 148 | 
| 149 std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_; | 149 std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_; | 
| 150 | 150 | 
| 151 gpu::GpuPreferences gpu_preferences_; | 151 gpu::GpuPreferences gpu_preferences_; | 
| 152 | 152 | 
| 153 // Information about the GPU, such as device and vendor ID. | 153 // Information about the GPU, such as device and vendor ID. | 
| 154 gpu::GPUInfo gpu_info_; | 154 gpu::GPUInfo gpu_info_; | 
| 155 | 155 | 
| 156 mojo::StrongBinding<mojom::GpuServiceInternal> binding_; | 156 mojo::BindingSet<mojom::GpuServiceInternal> bindings_; | 
| 
 
sadrul
2016/08/31 18:53:15
Should be just mojo::Binding<>
 
 | |
| 157 | 157 | 
| 158 DISALLOW_COPY_AND_ASSIGN(GpuServiceInternal); | 158 DISALLOW_COPY_AND_ASSIGN(GpuServiceInternal); | 
| 159 }; | 159 }; | 
| 160 | 160 | 
| 161 } // namespace ui | 161 } // namespace ui | 
| 162 | 162 | 
| 163 #endif // SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 163 #endif // SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_ | 
| OLD | NEW |