Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 1fb9201c58d29fbde43c47ce8305b46c99893df0..1fd28d0c525e40e99ae3d83ecbb1fdaafc8a41ff 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -50,7 +50,6 @@ |
#include "content/browser/frame_host/render_frame_host_impl.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/host_zoom_map_impl.h" |
#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/manifest/manifest_manager_host.h" |
@@ -118,6 +117,7 @@ |
#include "content/public/common/url_constants.h" |
#include "content/public/common/url_utils.h" |
#include "content/public/common/web_preferences.h" |
+#include "device/geolocation/geolocation_service_context.h" |
#include "net/base/url_util.h" |
#include "net/http/http_cache.h" |
#include "net/http/http_transaction_factory.h" |
@@ -416,7 +416,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context) |
is_subframe_(false), |
force_disable_overscroll_content_(false), |
last_dialog_suppressed_(false), |
- geolocation_service_context_(new GeolocationServiceContext()), |
+ geolocation_service_context_(new device::GeolocationServiceContext()), |
accessibility_mode_( |
BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()), |
audio_stream_monitor_(this), |
@@ -2366,7 +2366,8 @@ RenderFrameHost* WebContentsImpl::GetGuestByInstanceID( |
return guest->GetMainFrame(); |
} |
-GeolocationServiceContext* WebContentsImpl::GetGeolocationServiceContext() { |
+device::GeolocationServiceContext* |
+WebContentsImpl::GetGeolocationServiceContext() { |
return geolocation_service_context_.get(); |
} |