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

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

Issue 628773003: Partially convert geolocation IPC to Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Start providing updates on connection Created 6 years, 2 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 "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"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/metrics/user_metrics_action.h" 12 #include "base/metrics/user_metrics_action.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "content/browser/accessibility/accessibility_mode_helper.h" 14 #include "content/browser/accessibility/accessibility_mode_helper.h"
15 #include "content/browser/accessibility/browser_accessibility_manager.h" 15 #include "content/browser/accessibility/browser_accessibility_manager.h"
16 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 16 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
17 #include "content/browser/child_process_security_policy_impl.h" 17 #include "content/browser/child_process_security_policy_impl.h"
18 #include "content/browser/frame_host/cross_process_frame_connector.h" 18 #include "content/browser/frame_host/cross_process_frame_connector.h"
19 #include "content/browser/frame_host/cross_site_transferring_request.h" 19 #include "content/browser/frame_host/cross_site_transferring_request.h"
20 #include "content/browser/frame_host/frame_accessibility.h" 20 #include "content/browser/frame_host/frame_accessibility.h"
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/render_frame_host_delegate.h" 24 #include "content/browser/frame_host/render_frame_host_delegate.h"
25 #include "content/browser/frame_host/render_frame_proxy_host.h" 25 #include "content/browser/frame_host/render_frame_proxy_host.h"
26 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 26 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
27 #include "content/browser/geolocation/geolocation_service_context.h"
27 #include "content/browser/renderer_host/input/input_router.h" 28 #include "content/browser/renderer_host/input/input_router.h"
28 #include "content/browser/renderer_host/input/timeout_monitor.h" 29 #include "content/browser/renderer_host/input/timeout_monitor.h"
29 #include "content/browser/renderer_host/render_process_host_impl.h" 30 #include "content/browser/renderer_host/render_process_host_impl.h"
30 #include "content/browser/renderer_host/render_view_host_delegate.h" 31 #include "content/browser/renderer_host/render_view_host_delegate.h"
31 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 32 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
32 #include "content/browser/renderer_host/render_view_host_impl.h" 33 #include "content/browser/renderer_host/render_view_host_impl.h"
33 #include "content/browser/renderer_host/render_widget_host_impl.h" 34 #include "content/browser/renderer_host/render_widget_host_impl.h"
34 #include "content/browser/renderer_host/render_widget_host_view_base.h" 35 #include "content/browser/renderer_host/render_widget_host_view_base.h"
35 #include "content/browser/transition_request_manager.h" 36 #include "content/browser/transition_request_manager.h"
36 #include "content/common/accessibility_messages.h" 37 #include "content/common/accessibility_messages.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 this)); 197 this));
197 198
198 if (is_swapped_out) { 199 if (is_swapped_out) {
199 rfh_state_ = STATE_SWAPPED_OUT; 200 rfh_state_ = STATE_SWAPPED_OUT;
200 } else { 201 } else {
201 rfh_state_ = STATE_DEFAULT; 202 rfh_state_ = STATE_DEFAULT;
202 GetSiteInstance()->increment_active_frame_count(); 203 GetSiteInstance()->increment_active_frame_count();
203 } 204 }
204 205
205 if (GetProcess()->GetServiceRegistry()) { 206 if (GetProcess()->GetServiceRegistry()) {
207 RegisterMojoServices();
206 GetProcess()->GetServiceRegistry()->ConnectToRemoteService( 208 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(
207 &render_frame_setup_); 209 &render_frame_setup_);
208 mojo::ServiceProviderPtr service_provider; 210 mojo::ServiceProviderPtr service_provider;
209 render_frame_setup_->GetServiceProviderForFrame( 211 render_frame_setup_->GetServiceProviderForFrame(
210 routing_id_, mojo::GetProxy(&service_provider)); 212 routing_id_, mojo::GetProxy(&service_provider));
211 service_registry_.BindRemoteServiceProvider( 213 service_registry_.BindRemoteServiceProvider(
212 service_provider.PassMessagePipe()); 214 service_provider.PassMessagePipe());
213 215
214 #if defined(OS_ANDROID) 216 #if defined(OS_ANDROID)
215 service_registry_android_.reset( 217 service_registry_android_.reset(
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 } 1191 }
1190 1192
1191 void RenderFrameHostImpl::OnHidePopup() { 1193 void RenderFrameHostImpl::OnHidePopup() {
1192 RenderViewHostDelegateView* view = 1194 RenderViewHostDelegateView* view =
1193 render_view_host_->delegate_->GetDelegateView(); 1195 render_view_host_->delegate_->GetDelegateView();
1194 if (view) 1196 if (view)
1195 view->HidePopupMenu(); 1197 view->HidePopupMenu();
1196 } 1198 }
1197 #endif 1199 #endif
1198 1200
1201 void RenderFrameHostImpl::RegisterMojoServices() {
1202 GeolocationServiceContext* geolocation_service_context =
1203 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
1204 if (geolocation_service_context) {
1205 GetServiceRegistry()->AddService<GeolocationService>(
Charlie Reis 2014/10/23 17:27:17 nit: Can we add a TODO to add the process ID here,
blundell 2014/10/24 09:57:12 Done.
1206 base::Bind(&GeolocationServiceContext::CreateService,
1207 base::Unretained(geolocation_service_context),
1208 base::Bind(&RenderFrameHostImpl::DidUseGeolocationPermission,
1209 base::Unretained(this))));
1210 }
1211 }
1212
1199 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { 1213 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) {
1200 // Only main frames should be swapped out and retained inside a proxy host. 1214 // Only main frames should be swapped out and retained inside a proxy host.
1201 if (rfh_state == STATE_SWAPPED_OUT) 1215 if (rfh_state == STATE_SWAPPED_OUT)
1202 CHECK(!GetParent()); 1216 CHECK(!GetParent());
1203 1217
1204 // We update the number of RenderFrameHosts in a SiteInstance when the swapped 1218 // We update the number of RenderFrameHosts in a SiteInstance when the swapped
1205 // out status of a RenderFrameHost gets flipped to/from active. 1219 // out status of a RenderFrameHost gets flipped to/from active.
1206 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state)) 1220 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state))
1207 GetSiteInstance()->increment_active_frame_count(); 1221 GetSiteInstance()->increment_active_frame_count();
1208 else if (IsRFHStateActive(rfh_state_) && !IsRFHStateActive(rfh_state)) 1222 else if (IsRFHStateActive(rfh_state_) && !IsRFHStateActive(rfh_state))
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1562 void RenderFrameHostImpl::CancelSuspendedNavigations() { 1576 void RenderFrameHostImpl::CancelSuspendedNavigations() {
1563 // Clear any state if a pending navigation is canceled or preempted. 1577 // Clear any state if a pending navigation is canceled or preempted.
1564 if (suspended_nav_params_) 1578 if (suspended_nav_params_)
1565 suspended_nav_params_.reset(); 1579 suspended_nav_params_.reset();
1566 1580
1567 TRACE_EVENT_ASYNC_END0("navigation", 1581 TRACE_EVENT_ASYNC_END0("navigation",
1568 "RenderFrameHostImpl navigation suspended", this); 1582 "RenderFrameHostImpl navigation suspended", this);
1569 navigations_suspended_ = false; 1583 navigations_suspended_ = false;
1570 } 1584 }
1571 1585
1586 void RenderFrameHostImpl::DidUseGeolocationPermission() {
1587 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
1588 GetContentClient()->browser()->DidUseGeolocationPermission(
1589 delegate_->GetAsWebContents(),
1590 GetLastCommittedURL().GetOrigin(),
1591 top_frame->GetLastCommittedURL().GetOrigin());
1592 }
1593
1572 } // namespace content 1594 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/geolocation/geolocation_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698