| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 #include "device/vibration/vibration_manager_impl.h" | 98 #include "device/vibration/vibration_manager_impl.h" |
| 99 #include "device/wake_lock/wake_lock_service_context.h" | 99 #include "device/wake_lock/wake_lock_service_context.h" |
| 100 #include "media/base/media_switches.h" | 100 #include "media/base/media_switches.h" |
| 101 #include "media/media_features.h" | 101 #include "media/media_features.h" |
| 102 #include "media/mojo/interfaces/media_service.mojom.h" | 102 #include "media/mojo/interfaces/media_service.mojom.h" |
| 103 #include "media/mojo/interfaces/remoting.mojom.h" | 103 #include "media/mojo/interfaces/remoting.mojom.h" |
| 104 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" | 104 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
| 105 #include "mojo/public/cpp/bindings/strong_binding.h" | 105 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 106 #include "services/service_manager/public/cpp/connector.h" | 106 #include "services/service_manager/public/cpp/connector.h" |
| 107 #include "services/service_manager/public/cpp/interface_provider.h" | 107 #include "services/service_manager/public/cpp/interface_provider.h" |
| 108 #include "third_party/WebKit/public/platform/modules/shapedetection/facedetectio
n.mojom.h" | 108 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetecti
on_provider.mojom.h" |
| 109 #include "ui/accessibility/ax_tree.h" | 109 #include "ui/accessibility/ax_tree.h" |
| 110 #include "ui/accessibility/ax_tree_update.h" | 110 #include "ui/accessibility/ax_tree_update.h" |
| 111 #include "ui/gfx/geometry/quad_f.h" | 111 #include "ui/gfx/geometry/quad_f.h" |
| 112 #include "url/gurl.h" | 112 #include "url/gurl.h" |
| 113 | 113 |
| 114 #if defined(OS_ANDROID) | 114 #if defined(OS_ANDROID) |
| 115 #include "content/browser/android/app_web_message_port_message_filter.h" | 115 #include "content/browser/android/app_web_message_port_message_filter.h" |
| 116 #include "content/public/browser/android/java_interfaces.h" | 116 #include "content/public/browser/android/java_interfaces.h" |
| 117 #include "content/browser/media/android/media_player_renderer.h" | 117 #include "content/browser/media/android/media_player_renderer.h" |
| 118 #include "media/base/audio_renderer_sink.h" | 118 #include "media/base/audio_renderer_sink.h" |
| (...skipping 2105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2224 | 2224 |
| 2225 GetInterfaceRegistry()->AddInterface(base::Bind( | 2225 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2226 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); | 2226 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); |
| 2227 | 2227 |
| 2228 GetInterfaceRegistry()->AddInterface( | 2228 GetInterfaceRegistry()->AddInterface( |
| 2229 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); | 2229 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); |
| 2230 | 2230 |
| 2231 #if defined(OS_ANDROID) | 2231 #if defined(OS_ANDROID) |
| 2232 GetInterfaceRegistry()->AddInterface( | 2232 GetInterfaceRegistry()->AddInterface( |
| 2233 GetGlobalJavaInterfaces() | 2233 GetGlobalJavaInterfaces() |
| 2234 ->CreateInterfaceFactory<blink::mojom::FaceDetection>()); | 2234 ->CreateInterfaceFactory<blink::mojom::ShapeDetectionProvider>()); |
| 2235 | 2235 |
| 2236 GetInterfaceRegistry()->AddInterface( | 2236 GetInterfaceRegistry()->AddInterface( |
| 2237 GetGlobalJavaInterfaces() | 2237 GetGlobalJavaInterfaces() |
| 2238 ->CreateInterfaceFactory<device::VibrationManager>()); | 2238 ->CreateInterfaceFactory<device::VibrationManager>()); |
| 2239 | 2239 |
| 2240 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { | 2240 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { |
| 2241 // Creates a MojoRendererService, passing it a MediaPlayerRender. | 2241 // Creates a MojoRendererService, passing it a MediaPlayerRender. |
| 2242 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( | 2242 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( |
| 2243 &content::CreateMediaPlayerRenderer, base::Unretained(this))); | 2243 &content::CreateMediaPlayerRenderer, base::Unretained(this))); |
| 2244 } | 2244 } |
| (...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3328 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3328 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3329 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3329 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3330 return NavigationHandleImpl::Create( | 3330 return NavigationHandleImpl::Create( |
| 3331 params.url, frame_tree_node_, is_renderer_initiated, | 3331 params.url, frame_tree_node_, is_renderer_initiated, |
| 3332 params.was_within_same_page, base::TimeTicks::Now(), | 3332 params.was_within_same_page, base::TimeTicks::Now(), |
| 3333 entry_id_for_data_nav, params.gesture, | 3333 entry_id_for_data_nav, params.gesture, |
| 3334 false); // started_from_context_menu | 3334 false); // started_from_context_menu |
| 3335 } | 3335 } |
| 3336 | 3336 |
| 3337 } // namespace content | 3337 } // namespace content |
| OLD | NEW |