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

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

Issue 2528743002: Shape Detection: Implement FaceDetection on Mac as out-of-process service (Closed)
Patch Set: Launch shape detection service as a utility process Created 3 years, 11 months 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
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 <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "content/browser/renderer_host/input/input_router_impl.h" 46 #include "content/browser/renderer_host/input/input_router_impl.h"
47 #include "content/browser/renderer_host/input/timeout_monitor.h" 47 #include "content/browser/renderer_host/input/timeout_monitor.h"
48 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" 48 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h"
49 #include "content/browser/renderer_host/render_process_host_impl.h" 49 #include "content/browser/renderer_host/render_process_host_impl.h"
50 #include "content/browser/renderer_host/render_view_host_delegate.h" 50 #include "content/browser/renderer_host/render_view_host_delegate.h"
51 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 51 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
52 #include "content/browser/renderer_host/render_view_host_impl.h" 52 #include "content/browser/renderer_host/render_view_host_impl.h"
53 #include "content/browser/renderer_host/render_widget_host_delegate.h" 53 #include "content/browser/renderer_host/render_widget_host_delegate.h"
54 #include "content/browser/renderer_host/render_widget_host_impl.h" 54 #include "content/browser/renderer_host/render_widget_host_impl.h"
55 #include "content/browser/renderer_host/render_widget_host_view_base.h" 55 #include "content/browser/renderer_host/render_widget_host_view_base.h"
56 #include "content/browser/shapedetection/face_detection_service_dispatcher.h"
56 #include "content/browser/shared_worker/shared_worker_service_impl.h" 57 #include "content/browser/shared_worker/shared_worker_service_impl.h"
57 #include "content/browser/websockets/websocket_manager.h" 58 #include "content/browser/websockets/websocket_manager.h"
58 #include "content/browser/webui/web_ui_controller_factory_registry.h" 59 #include "content/browser/webui/web_ui_controller_factory_registry.h"
59 #include "content/common/accessibility_messages.h" 60 #include "content/common/accessibility_messages.h"
60 #include "content/common/associated_interface_provider_impl.h" 61 #include "content/common/associated_interface_provider_impl.h"
61 #include "content/common/associated_interfaces.mojom.h" 62 #include "content/common/associated_interfaces.mojom.h"
62 #include "content/common/frame_messages.h" 63 #include "content/common/frame_messages.h"
63 #include "content/common/frame_owner_properties.h" 64 #include "content/common/frame_owner_properties.h"
64 #include "content/common/input_messages.h" 65 #include "content/common/input_messages.h"
65 #include "content/common/inter_process_time_ticks_converter.h" 66 #include "content/common/inter_process_time_ticks_converter.h"
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after
2265 GetInterfaceRegistry()->AddInterface( 2266 GetInterfaceRegistry()->AddInterface(
2266 base::Bind(&PermissionServiceContext::CreateService, 2267 base::Bind(&PermissionServiceContext::CreateService,
2267 base::Unretained(permission_service_context_.get()))); 2268 base::Unretained(permission_service_context_.get())));
2268 2269
2269 GetInterfaceRegistry()->AddInterface(base::Bind( 2270 GetInterfaceRegistry()->AddInterface(base::Bind(
2270 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); 2271 &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
2271 2272
2272 GetInterfaceRegistry()->AddInterface( 2273 GetInterfaceRegistry()->AddInterface(
2273 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); 2274 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this)));
2274 2275
2276 #if defined(OS_MACOSX)
2277 GetInterfaceRegistry()->AddInterface(
2278 base::Bind(&FaceDetectionServiceDispatcher::CreateMojoService,
2279 base::Unretained(this)));
2280 #endif
2281
2275 #if defined(OS_ANDROID) 2282 #if defined(OS_ANDROID)
2276 GetInterfaceRegistry()->AddInterface( 2283 GetInterfaceRegistry()->AddInterface(
2277 GetGlobalJavaInterfaces() 2284 GetGlobalJavaInterfaces()
2278 ->CreateInterfaceFactory< 2285 ->CreateInterfaceFactory<
2279 shape_detection::mojom::FaceDetectionProvider>()); 2286 shape_detection::mojom::FaceDetectionProvider>());
2280 2287
2281 GetInterfaceRegistry()->AddInterface( 2288 GetInterfaceRegistry()->AddInterface(
2282 GetGlobalJavaInterfaces() 2289 GetGlobalJavaInterfaces()
2283 ->CreateInterfaceFactory<device::VibrationManager>()); 2290 ->CreateInterfaceFactory<device::VibrationManager>());
2284 2291
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
3385 // There is no pending NavigationEntry in these cases, so pass 0 as the 3392 // There is no pending NavigationEntry in these cases, so pass 0 as the
3386 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3393 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3387 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3394 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3388 return NavigationHandleImpl::Create( 3395 return NavigationHandleImpl::Create(
3389 params.url, frame_tree_node_, is_renderer_initiated, 3396 params.url, frame_tree_node_, is_renderer_initiated,
3390 params.was_within_same_page, base::TimeTicks::Now(), 3397 params.was_within_same_page, base::TimeTicks::Now(),
3391 entry_id_for_data_nav, false); // started_from_context_menu 3398 entry_id_for_data_nav, false); // started_from_context_menu
3392 } 3399 }
3393 3400
3394 } // namespace content 3401 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698