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

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

Issue 2629523008: Shape Detection: Remove ConstructorCallWith=Document (Closed)
Patch Set: Add layout test for worker 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 "services/shape_detection/public/interfaces/facedetection_provider.mojo m.h"
110 #include "ui/accessibility/ax_tree.h" 109 #include "ui/accessibility/ax_tree.h"
111 #include "ui/accessibility/ax_tree_update.h" 110 #include "ui/accessibility/ax_tree_update.h"
112 #include "ui/gfx/geometry/quad_f.h" 111 #include "ui/gfx/geometry/quad_f.h"
113 #include "url/gurl.h" 112 #include "url/gurl.h"
114 113
115 #if defined(OS_ANDROID) 114 #if defined(OS_ANDROID)
116 #include "content/browser/android/app_web_message_port_message_filter.h" 115 #include "content/browser/android/app_web_message_port_message_filter.h"
117 #include "content/public/browser/android/java_interfaces.h" 116 #include "content/public/browser/android/java_interfaces.h"
118 #include "content/browser/media/android/media_player_renderer.h" 117 #include "content/browser/media/android/media_player_renderer.h"
119 #include "media/base/audio_renderer_sink.h" 118 #include "media/base/audio_renderer_sink.h"
(...skipping 2154 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 2273
2275 GetInterfaceRegistry()->AddInterface(base::Bind( 2274 GetInterfaceRegistry()->AddInterface(base::Bind(
2276 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); 2275 &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
2277 2276
2278 GetInterfaceRegistry()->AddInterface( 2277 GetInterfaceRegistry()->AddInterface(
2279 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); 2278 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this)));
2280 2279
2281 #if defined(OS_ANDROID) 2280 #if defined(OS_ANDROID)
2282 GetInterfaceRegistry()->AddInterface( 2281 GetInterfaceRegistry()->AddInterface(
2283 GetGlobalJavaInterfaces() 2282 GetGlobalJavaInterfaces()
2284 ->CreateInterfaceFactory<
2285 shape_detection::mojom::FaceDetectionProvider>());
2286
2287 GetInterfaceRegistry()->AddInterface(
2288 GetGlobalJavaInterfaces()
2289 ->CreateInterfaceFactory<device::VibrationManager>()); 2283 ->CreateInterfaceFactory<device::VibrationManager>());
2290 2284
2291 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { 2285 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) {
2292 // Creates a MojoRendererService, passing it a MediaPlayerRender. 2286 // Creates a MojoRendererService, passing it a MediaPlayerRender.
2293 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( 2287 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind(
2294 &content::CreateMediaPlayerRenderer, base::Unretained(this))); 2288 &content::CreateMediaPlayerRenderer, base::Unretained(this)));
2295 } 2289 }
2296 #else 2290 #else
2297 GetInterfaceRegistry()->AddInterface( 2291 GetInterfaceRegistry()->AddInterface(
2298 base::Bind(&device::VibrationManagerImpl::Create)); 2292 base::Bind(&device::VibrationManagerImpl::Create));
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
3395 // There is no pending NavigationEntry in these cases, so pass 0 as the 3389 // There is no pending NavigationEntry in these cases, so pass 0 as the
3396 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3390 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3397 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3391 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3398 return NavigationHandleImpl::Create( 3392 return NavigationHandleImpl::Create(
3399 params.url, frame_tree_node_, is_renderer_initiated, 3393 params.url, frame_tree_node_, is_renderer_initiated,
3400 params.was_within_same_page, base::TimeTicks::Now(), 3394 params.was_within_same_page, base::TimeTicks::Now(),
3401 entry_id_for_data_nav, false); // started_from_context_menu 3395 entry_id_for_data_nav, false); // started_from_context_menu
3402 } 3396 }
3403 3397
3404 } // namespace content 3398 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_manifest_overlay.json ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698