| 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 17 matching lines...) Expand all Loading... |
| 28 #include "content/browser/frame_host/frame_tree.h" | 28 #include "content/browser/frame_host/frame_tree.h" |
| 29 #include "content/browser/frame_host/frame_tree_node.h" | 29 #include "content/browser/frame_host/frame_tree_node.h" |
| 30 #include "content/browser/frame_host/navigation_entry_impl.h" | 30 #include "content/browser/frame_host/navigation_entry_impl.h" |
| 31 #include "content/browser/frame_host/navigation_handle_impl.h" | 31 #include "content/browser/frame_host/navigation_handle_impl.h" |
| 32 #include "content/browser/frame_host/navigation_request.h" | 32 #include "content/browser/frame_host/navigation_request.h" |
| 33 #include "content/browser/frame_host/navigator.h" | 33 #include "content/browser/frame_host/navigator.h" |
| 34 #include "content/browser/frame_host/navigator_impl.h" | 34 #include "content/browser/frame_host/navigator_impl.h" |
| 35 #include "content/browser/frame_host/render_frame_host_delegate.h" | 35 #include "content/browser/frame_host/render_frame_host_delegate.h" |
| 36 #include "content/browser/frame_host/render_frame_proxy_host.h" | 36 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 38 #include "content/browser/installedapp/installed_app_provider_impl_default.h" |
| 38 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 39 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 39 #include "content/browser/media/media_interface_proxy.h" | 40 #include "content/browser/media/media_interface_proxy.h" |
| 40 #include "content/browser/media/session/media_session_service_impl.h" | 41 #include "content/browser/media/session/media_session_service_impl.h" |
| 41 #include "content/browser/permissions/permission_service_context.h" | 42 #include "content/browser/permissions/permission_service_context.h" |
| 42 #include "content/browser/permissions/permission_service_impl.h" | 43 #include "content/browser/permissions/permission_service_impl.h" |
| 43 #include "content/browser/presentation/presentation_service_impl.h" | 44 #include "content/browser/presentation/presentation_service_impl.h" |
| 44 #include "content/browser/renderer_host/input/input_router_impl.h" | 45 #include "content/browser/renderer_host/input/input_router_impl.h" |
| 45 #include "content/browser/renderer_host/input/timeout_monitor.h" | 46 #include "content/browser/renderer_host/input/timeout_monitor.h" |
| 46 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" | 47 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" |
| 47 #include "content/browser/renderer_host/render_process_host_impl.h" | 48 #include "content/browser/renderer_host/render_process_host_impl.h" |
| (...skipping 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2272 WindowOpenDisposition disposition, | 2273 WindowOpenDisposition disposition, |
| 2273 const gfx::Rect& initial_rect, | 2274 const gfx::Rect& initial_rect, |
| 2274 bool user_gesture) { | 2275 bool user_gesture) { |
| 2275 delegate_->ShowCreatedWindow(GetProcess()->GetID(), pending_widget_routing_id, | 2276 delegate_->ShowCreatedWindow(GetProcess()->GetID(), pending_widget_routing_id, |
| 2276 disposition, initial_rect, user_gesture); | 2277 disposition, initial_rect, user_gesture); |
| 2277 } | 2278 } |
| 2278 | 2279 |
| 2279 void RenderFrameHostImpl::RegisterMojoInterfaces() { | 2280 void RenderFrameHostImpl::RegisterMojoInterfaces() { |
| 2280 device::GeolocationServiceContext* geolocation_service_context = | 2281 device::GeolocationServiceContext* geolocation_service_context = |
| 2281 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; | 2282 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; |
| 2283 |
| 2284 // The default (no-op) implementation of InstalledAppProvider. |
| 2285 // TODO(mgiuca): Implement the "real" one for Android in Java, and do not add |
| 2286 // the default one on that platform. |
| 2287 GetInterfaceRegistry()->AddInterface( |
| 2288 base::Bind(&InstalledAppProviderImplDefault::Create)); |
| 2289 |
| 2282 if (geolocation_service_context) { | 2290 if (geolocation_service_context) { |
| 2283 // TODO(creis): Bind process ID here so that GeolocationServiceImpl | 2291 // TODO(creis): Bind process ID here so that GeolocationServiceImpl |
| 2284 // can perform permissions checks once site isolation is complete. | 2292 // can perform permissions checks once site isolation is complete. |
| 2285 // crbug.com/426384 | 2293 // crbug.com/426384 |
| 2286 // NOTE: At shutdown, there is no guaranteed ordering between destruction of | 2294 // NOTE: At shutdown, there is no guaranteed ordering between destruction of |
| 2287 // this object and destruction of any GeolocationServicesImpls created via | 2295 // this object and destruction of any GeolocationServicesImpls created via |
| 2288 // the below service registry, the reason being that the destruction of the | 2296 // the below service registry, the reason being that the destruction of the |
| 2289 // latter is triggered by receiving a message that the pipe was closed from | 2297 // latter is triggered by receiving a message that the pipe was closed from |
| 2290 // the renderer side. Hence, supply the reference to this object as a weak | 2298 // the renderer side. Hence, supply the reference to this object as a weak |
| 2291 // pointer. | 2299 // pointer. |
| (...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3459 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3467 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3460 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3468 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3461 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3469 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3462 return NavigationHandleImpl::Create( | 3470 return NavigationHandleImpl::Create( |
| 3463 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3471 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
| 3464 params.was_within_same_page, base::TimeTicks::Now(), | 3472 params.was_within_same_page, base::TimeTicks::Now(), |
| 3465 entry_id_for_data_nav, false); // started_from_context_menu | 3473 entry_id_for_data_nav, false); // started_from_context_menu |
| 3466 } | 3474 } |
| 3467 | 3475 |
| 3468 } // namespace content | 3476 } // namespace content |
| OLD | NEW |