OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 #include "device/vibration/vibration_manager_impl.h" | 99 #include "device/vibration/vibration_manager_impl.h" |
100 #include "device/wake_lock/wake_lock_service_context.h" | 100 #include "device/wake_lock/wake_lock_service_context.h" |
101 #include "media/base/media_switches.h" | 101 #include "media/base/media_switches.h" |
102 #include "media/media_features.h" | 102 #include "media/media_features.h" |
103 #include "media/mojo/interfaces/media_service.mojom.h" | 103 #include "media/mojo/interfaces/media_service.mojom.h" |
104 #include "media/mojo/interfaces/remoting.mojom.h" | 104 #include "media/mojo/interfaces/remoting.mojom.h" |
105 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" | 105 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
106 #include "mojo/public/cpp/bindings/strong_binding.h" | 106 #include "mojo/public/cpp/bindings/strong_binding.h" |
107 #include "services/service_manager/public/cpp/connector.h" | 107 #include "services/service_manager/public/cpp/connector.h" |
108 #include "services/service_manager/public/cpp/interface_provider.h" | 108 #include "services/service_manager/public/cpp/interface_provider.h" |
109 #include "third_party/WebKit/public/platform/modules/shapedetection/facedetectio
n_provider.mojom.h" | 109 #include "services/shape_detection/public/interfaces/facedetection_provider.mojo
m.h" |
110 #include "ui/accessibility/ax_tree.h" | 110 #include "ui/accessibility/ax_tree.h" |
111 #include "ui/accessibility/ax_tree_update.h" | 111 #include "ui/accessibility/ax_tree_update.h" |
112 #include "ui/gfx/geometry/quad_f.h" | 112 #include "ui/gfx/geometry/quad_f.h" |
113 #include "url/gurl.h" | 113 #include "url/gurl.h" |
114 | 114 |
115 #if defined(OS_ANDROID) | 115 #if defined(OS_ANDROID) |
116 #include "content/browser/android/app_web_message_port_message_filter.h" | 116 #include "content/browser/android/app_web_message_port_message_filter.h" |
117 #include "content/public/browser/android/java_interfaces.h" | 117 #include "content/public/browser/android/java_interfaces.h" |
118 #include "content/browser/media/android/media_player_renderer.h" | 118 #include "content/browser/media/android/media_player_renderer.h" |
119 #include "media/base/audio_renderer_sink.h" | 119 #include "media/base/audio_renderer_sink.h" |
(...skipping 2148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2268 | 2268 |
2269 GetInterfaceRegistry()->AddInterface(base::Bind( | 2269 GetInterfaceRegistry()->AddInterface(base::Bind( |
2270 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); | 2270 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); |
2271 | 2271 |
2272 GetInterfaceRegistry()->AddInterface( | 2272 GetInterfaceRegistry()->AddInterface( |
2273 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); | 2273 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); |
2274 | 2274 |
2275 #if defined(OS_ANDROID) | 2275 #if defined(OS_ANDROID) |
2276 GetInterfaceRegistry()->AddInterface( | 2276 GetInterfaceRegistry()->AddInterface( |
2277 GetGlobalJavaInterfaces() | 2277 GetGlobalJavaInterfaces() |
2278 ->CreateInterfaceFactory<blink::mojom::FaceDetectionProvider>()); | 2278 ->CreateInterfaceFactory< |
| 2279 shape_detection::mojom::FaceDetectionProvider>()); |
2279 | 2280 |
2280 GetInterfaceRegistry()->AddInterface( | 2281 GetInterfaceRegistry()->AddInterface( |
2281 GetGlobalJavaInterfaces() | 2282 GetGlobalJavaInterfaces() |
2282 ->CreateInterfaceFactory<device::VibrationManager>()); | 2283 ->CreateInterfaceFactory<device::VibrationManager>()); |
2283 | 2284 |
2284 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { | 2285 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { |
2285 // Creates a MojoRendererService, passing it a MediaPlayerRender. | 2286 // Creates a MojoRendererService, passing it a MediaPlayerRender. |
2286 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( | 2287 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( |
2287 &content::CreateMediaPlayerRenderer, base::Unretained(this))); | 2288 &content::CreateMediaPlayerRenderer, base::Unretained(this))); |
2288 } | 2289 } |
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3384 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3385 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3385 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3386 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3386 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3387 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3387 return NavigationHandleImpl::Create( | 3388 return NavigationHandleImpl::Create( |
3388 params.url, frame_tree_node_, is_renderer_initiated, | 3389 params.url, frame_tree_node_, is_renderer_initiated, |
3389 params.was_within_same_page, base::TimeTicks::Now(), | 3390 params.was_within_same_page, base::TimeTicks::Now(), |
3390 entry_id_for_data_nav, false); // started_from_context_menu | 3391 entry_id_for_data_nav, false); // started_from_context_menu |
3391 } | 3392 } |
3392 | 3393 |
3393 } // namespace content | 3394 } // namespace content |
OLD | NEW |