Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index a7a06306d3ebd895c1f03c8cc160105543cc3f0a..d3d38f90054589d92e86898ae5d7c7eaafa0de48 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -35,7 +35,6 @@ |
#include "content/browser/frame_host/render_frame_host_delegate.h" |
#include "content/browser/frame_host/render_frame_proxy_host.h" |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
-#include "content/browser/geolocation/geolocation_service_context.h" |
#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/permissions/permission_service_context.h" |
#include "content/browser/permissions/permission_service_impl.h" |
@@ -80,6 +79,7 @@ |
#include "content/public/common/isolated_world_ids.h" |
#include "content/public/common/url_constants.h" |
#include "content/public/common/url_utils.h" |
+#include "device/geolocation/geolocation_service_context.h" |
#include "device/vibration/vibration_manager_impl.h" |
#include "services/shell/public/cpp/connector.h" |
#include "services/shell/public/cpp/interface_provider.h" |
@@ -2051,7 +2051,7 @@ void RenderFrameHostImpl::OnHidePopup() { |
#endif |
void RenderFrameHostImpl::RegisterMojoInterfaces() { |
- GeolocationServiceContext* geolocation_service_context = |
+ device::GeolocationServiceContext* geolocation_service_context = |
delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; |
if (geolocation_service_context) { |
// TODO(creis): Bind process ID here so that GeolocationServiceImpl |
@@ -2064,7 +2064,7 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { |
// the renderer side. Hence, supply the reference to this object as a weak |
// pointer. |
GetInterfaceRegistry()->AddInterface( |
- base::Bind(&GeolocationServiceContext::CreateService, |
+ base::Bind(&device::GeolocationServiceContext::CreateService, |
base::Unretained(geolocation_service_context), |
base::Bind(&RenderFrameHostImpl::DidUseGeolocationPermission, |
weak_ptr_factory_.GetWeakPtr()))); |