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 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 5 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "content/browser/renderer_host/render_widget_helper.h" | 22 #include "content/browser/renderer_host/render_widget_helper.h" |
23 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 23 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
24 #include "content/common/gpu_host_messages.h" | 24 #include "content/common/gpu_host_messages.h" |
25 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
26 #include "gpu/ipc/common/memory_stats.h" | 26 #include "gpu/ipc/common/memory_stats.h" |
27 #include "ui/gfx/swap_result.h" | 27 #include "ui/gfx/swap_result.h" |
28 | 28 |
29 #if defined(OS_ANDROID) | 29 #if defined(OS_ANDROID) |
30 #include "content/public/browser/android/java_interfaces.h" | 30 #include "content/public/browser/android/java_interfaces.h" |
31 #include "media/mojo/interfaces/android_overlay.mojom.h" | 31 #include "media/mojo/interfaces/android_overlay.mojom.h" |
| 32 #include "services/service_manager/public/cpp/binder_registry.h" |
32 #include "services/service_manager/public/cpp/interface_provider.h" | 33 #include "services/service_manager/public/cpp/interface_provider.h" |
33 #include "services/service_manager/public/cpp/interface_registry.h" | |
34 #endif | 34 #endif |
35 | 35 |
36 #if defined(USE_OZONE) | 36 #if defined(USE_OZONE) |
37 #include "ui/ozone/public/gpu_platform_support_host.h" | 37 #include "ui/ozone/public/gpu_platform_support_host.h" |
38 #include "ui/ozone/public/ozone_platform.h" | 38 #include "ui/ozone/public/ozone_platform.h" |
39 #endif | 39 #endif |
40 | 40 |
41 namespace content { | 41 namespace content { |
42 | 42 |
43 namespace { | 43 namespace { |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 GpuProcessHostUIShim::~GpuProcessHostUIShim() { | 142 GpuProcessHostUIShim::~GpuProcessHostUIShim() { |
143 DCHECK(CalledOnValidThread()); | 143 DCHECK(CalledOnValidThread()); |
144 g_hosts_by_id.Pointer()->Remove(host_id_); | 144 g_hosts_by_id.Pointer()->Remove(host_id_); |
145 } | 145 } |
146 | 146 |
147 #if defined(OS_ANDROID) | 147 #if defined(OS_ANDROID) |
148 // static | 148 // static |
149 void GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces( | 149 void GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces( |
150 service_manager::InterfaceRegistry* registry) { | 150 service_manager::BinderRegistry* registry) { |
151 registry->AddInterface(base::Bind( | 151 registry->AddInterface(base::Bind( |
152 &BindJavaInterfaceOnUIThread<media::mojom::AndroidOverlayProvider>)); | 152 &BindJavaInterfaceOnUIThread<media::mojom::AndroidOverlayProvider>)); |
153 } | 153 } |
154 #endif | 154 #endif |
155 | 155 |
156 } // namespace content | 156 } // namespace content |
OLD | NEW |