Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(425)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2564163003: ShapeDetection: Add ShapeDetectionProvider (Closed)
Patch Set: Name change: mockFaceDetectionProviderReady, rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/DEPS ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/facedetectio n_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 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after
2225 2225
2226 GetInterfaceRegistry()->AddInterface(base::Bind( 2226 GetInterfaceRegistry()->AddInterface(base::Bind(
2227 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); 2227 &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
2228 2228
2229 GetInterfaceRegistry()->AddInterface( 2229 GetInterfaceRegistry()->AddInterface(
2230 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); 2230 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this)));
2231 2231
2232 #if defined(OS_ANDROID) 2232 #if defined(OS_ANDROID)
2233 GetInterfaceRegistry()->AddInterface( 2233 GetInterfaceRegistry()->AddInterface(
2234 GetGlobalJavaInterfaces() 2234 GetGlobalJavaInterfaces()
2235 ->CreateInterfaceFactory<blink::mojom::FaceDetection>()); 2235 ->CreateInterfaceFactory<blink::mojom::FaceDetectionProvider>());
2236 2236
2237 GetInterfaceRegistry()->AddInterface( 2237 GetInterfaceRegistry()->AddInterface(
2238 GetGlobalJavaInterfaces() 2238 GetGlobalJavaInterfaces()
2239 ->CreateInterfaceFactory<device::VibrationManager>()); 2239 ->CreateInterfaceFactory<device::VibrationManager>());
2240 2240
2241 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { 2241 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) {
2242 // Creates a MojoRendererService, passing it a MediaPlayerRender. 2242 // Creates a MojoRendererService, passing it a MediaPlayerRender.
2243 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( 2243 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind(
2244 &content::CreateMediaPlayerRenderer, base::Unretained(this))); 2244 &content::CreateMediaPlayerRenderer, base::Unretained(this)));
2245 } 2245 }
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
3327 // There is no pending NavigationEntry in these cases, so pass 0 as the 3327 // There is no pending NavigationEntry in these cases, so pass 0 as the
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, false); // started_from_context_menu 3333 entry_id_for_data_nav, false); // started_from_context_menu
3334 } 3334 }
3335 3335
3336 } // namespace content 3336 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698