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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "content/browser/frame_host/frame_tree.h" | 21 #include "content/browser/frame_host/frame_tree.h" |
22 #include "content/browser/frame_host/frame_tree_node.h" | 22 #include "content/browser/frame_host/frame_tree_node.h" |
23 #include "content/browser/frame_host/navigator.h" | 23 #include "content/browser/frame_host/navigator.h" |
24 #include "content/browser/frame_host/navigator_impl.h" | 24 #include "content/browser/frame_host/navigator_impl.h" |
25 #include "content/browser/frame_host/render_frame_host_delegate.h" | 25 #include "content/browser/frame_host/render_frame_host_delegate.h" |
26 #include "content/browser/frame_host/render_frame_proxy_host.h" | 26 #include "content/browser/frame_host/render_frame_proxy_host.h" |
27 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 27 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
28 #include "content/browser/geolocation/geolocation_service_context.h" | 28 #include "content/browser/geolocation/geolocation_service_context.h" |
29 #include "content/browser/permissions/permission_service_context.h" | 29 #include "content/browser/permissions/permission_service_context.h" |
30 #include "content/browser/permissions/permission_service_impl.h" | 30 #include "content/browser/permissions/permission_service_impl.h" |
| 31 #include "content/browser/presentation/presentation_service_impl.h" |
31 #include "content/browser/renderer_host/input/input_router.h" | 32 #include "content/browser/renderer_host/input/input_router.h" |
32 #include "content/browser/renderer_host/input/timeout_monitor.h" | 33 #include "content/browser/renderer_host/input/timeout_monitor.h" |
33 #include "content/browser/renderer_host/render_process_host_impl.h" | 34 #include "content/browser/renderer_host/render_process_host_impl.h" |
34 #include "content/browser/renderer_host/render_view_host_delegate.h" | 35 #include "content/browser/renderer_host/render_view_host_delegate.h" |
35 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 36 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
36 #include "content/browser/renderer_host/render_view_host_impl.h" | 37 #include "content/browser/renderer_host/render_view_host_impl.h" |
37 #include "content/browser/renderer_host/render_widget_host_impl.h" | 38 #include "content/browser/renderer_host/render_widget_host_impl.h" |
38 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 39 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
39 #include "content/browser/transition_request_manager.h" | 40 #include "content/browser/transition_request_manager.h" |
40 #include "content/common/accessibility_messages.h" | 41 #include "content/common/accessibility_messages.h" |
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 base::Bind(&RenderFrameHostImpl::DidUseGeolocationPermission, | 1277 base::Bind(&RenderFrameHostImpl::DidUseGeolocationPermission, |
1277 base::Unretained(this)))); | 1278 base::Unretained(this)))); |
1278 } | 1279 } |
1279 | 1280 |
1280 if (!permission_service_context_) | 1281 if (!permission_service_context_) |
1281 permission_service_context_.reset(new PermissionServiceContext(this)); | 1282 permission_service_context_.reset(new PermissionServiceContext(this)); |
1282 | 1283 |
1283 GetServiceRegistry()->AddService<PermissionService>( | 1284 GetServiceRegistry()->AddService<PermissionService>( |
1284 base::Bind(&PermissionServiceContext::CreateService, | 1285 base::Bind(&PermissionServiceContext::CreateService, |
1285 base::Unretained(permission_service_context_.get()))); | 1286 base::Unretained(permission_service_context_.get()))); |
| 1287 |
| 1288 GetServiceRegistry()->AddService<presentation::PresentationService>( |
| 1289 base::Bind(&PresentationServiceImpl::CreateService)); |
1286 } | 1290 } |
1287 | 1291 |
1288 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { | 1292 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { |
1289 // Only main frames should be swapped out and retained inside a proxy host. | 1293 // Only main frames should be swapped out and retained inside a proxy host. |
1290 if (rfh_state == STATE_SWAPPED_OUT) | 1294 if (rfh_state == STATE_SWAPPED_OUT) |
1291 CHECK(!GetParent()); | 1295 CHECK(!GetParent()); |
1292 | 1296 |
1293 // We update the number of RenderFrameHosts in a SiteInstance when the swapped | 1297 // We update the number of RenderFrameHosts in a SiteInstance when the swapped |
1294 // out status of a RenderFrameHost gets flipped to/from active. | 1298 // out status of a RenderFrameHost gets flipped to/from active. |
1295 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state)) | 1299 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state)) |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1735 void RenderFrameHostImpl::DidUseGeolocationPermission() { | 1739 void RenderFrameHostImpl::DidUseGeolocationPermission() { |
1736 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); | 1740 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); |
1737 GetContentClient()->browser()->RegisterPermissionUsage( | 1741 GetContentClient()->browser()->RegisterPermissionUsage( |
1738 PERMISSION_GEOLOCATION, | 1742 PERMISSION_GEOLOCATION, |
1739 delegate_->GetAsWebContents(), | 1743 delegate_->GetAsWebContents(), |
1740 GetLastCommittedURL().GetOrigin(), | 1744 GetLastCommittedURL().GetOrigin(), |
1741 top_frame->GetLastCommittedURL().GetOrigin()); | 1745 top_frame->GetLastCommittedURL().GetOrigin()); |
1742 } | 1746 } |
1743 | 1747 |
1744 } // namespace content | 1748 } // namespace content |
OLD | NEW |