Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_GPU_GPU_CHILD_THREAD_H_ | 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ | 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 #include "content/child/child_thread_impl.h" | 22 #include "content/child/child_thread_impl.h" |
| 23 #include "content/common/associated_interface_registry_impl.h" | 23 #include "content/common/associated_interface_registry_impl.h" |
| 24 #include "gpu/command_buffer/service/gpu_preferences.h" | 24 #include "gpu/command_buffer/service/gpu_preferences.h" |
| 25 #include "gpu/config/gpu_feature_info.h" | 25 #include "gpu/config/gpu_feature_info.h" |
| 26 #include "gpu/config/gpu_info.h" | 26 #include "gpu/config/gpu_info.h" |
| 27 #include "gpu/ipc/service/gpu_channel.h" | 27 #include "gpu/ipc/service/gpu_channel.h" |
| 28 #include "gpu/ipc/service/gpu_channel_manager.h" | 28 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 29 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 29 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
| 30 #include "gpu/ipc/service/gpu_config.h" | 30 #include "gpu/ipc/service/gpu_config.h" |
| 31 #include "gpu/ipc/service/x_util.h" | 31 #include "gpu/ipc/service/x_util.h" |
| 32 #include "media/base/android_overlay_mojo_factory.h" | |
|
watk
2017/05/12 19:13:54
can be deleted?
liberato (no reviews please)
2017/05/12 20:57:45
Reverted.
| |
| 32 #include "mojo/public/cpp/bindings/associated_binding_set.h" | 33 #include "mojo/public/cpp/bindings/associated_binding_set.h" |
| 33 #include "mojo/public/cpp/bindings/binding_set.h" | 34 #include "mojo/public/cpp/bindings/binding_set.h" |
| 34 #include "services/service_manager/public/interfaces/service_factory.mojom.h" | 35 #include "services/service_manager/public/interfaces/service_factory.mojom.h" |
| 35 #include "services/ui/gpu/gpu_service.h" | 36 #include "services/ui/gpu/gpu_service.h" |
| 36 #include "services/ui/gpu/interfaces/gpu_main.mojom.h" | 37 #include "services/ui/gpu/interfaces/gpu_main.mojom.h" |
| 37 #include "ui/gfx/native_widget_types.h" | 38 #include "ui/gfx/native_widget_types.h" |
| 38 | 39 |
| 39 namespace gpu { | 40 namespace gpu { |
| 40 class GpuWatchdogThread; | 41 class GpuWatchdogThread; |
| 41 } | 42 } |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 base::Closure release_pending_requests_closure_; | 141 base::Closure release_pending_requests_closure_; |
| 141 | 142 |
| 142 base::WeakPtrFactory<GpuChildThread> weak_factory_; | 143 base::WeakPtrFactory<GpuChildThread> weak_factory_; |
| 143 | 144 |
| 144 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 145 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 145 }; | 146 }; |
| 146 | 147 |
| 147 } // namespace content | 148 } // namespace content |
| 148 | 149 |
| 149 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 150 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |