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 dee333635a7246c22b55117c67174828606f013c..14e73cf6fde453b85d183c146604e71b12b1779a 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -36,6 +36,7 @@ |
#include "content/browser/frame_host/render_frame_host_impl.h" |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
#include "content/browser/geolocation/geolocation_dispatcher_host.h" |
+#include "content/browser/geolocation/geolocation_service_impl_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" |
@@ -335,9 +336,8 @@ WebContentsImpl::ColorChooserInfo::~ColorChooserInfo() { |
// WebContentsImpl ------------------------------------------------------------- |
-WebContentsImpl::WebContentsImpl( |
- BrowserContext* browser_context, |
- WebContentsImpl* opener) |
+WebContentsImpl::WebContentsImpl(BrowserContext* browser_context, |
+ WebContentsImpl* opener) |
: delegate_(NULL), |
controller_(this, browser_context), |
render_view_host_delegate_view_(NULL), |
@@ -347,7 +347,10 @@ WebContentsImpl::WebContentsImpl( |
accessible_parent_(NULL), |
#endif |
frame_tree_(new NavigatorImpl(&controller_, this), |
- this, this, this, this), |
+ this, |
+ this, |
+ this, |
+ this), |
is_loading_(false), |
is_load_to_different_document_(false), |
crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING), |
@@ -378,6 +381,7 @@ WebContentsImpl::WebContentsImpl( |
is_subframe_(false), |
force_disable_overscroll_content_(false), |
last_dialog_suppressed_(false), |
+ geolocation_context_(new GeolocationServiceImplContext()), |
accessibility_mode_( |
BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()), |
audio_stream_monitor_(this), |
@@ -1847,6 +1851,10 @@ RenderFrameHost* WebContentsImpl::GetGuestByInstanceID( |
return guest->GetMainFrame(); |
} |
+GeolocationServiceImplContext* WebContentsImpl::GetGeolocationContext() { |
+ return geolocation_context_.get(); |
+} |
+ |
void WebContentsImpl::OnShowValidationMessage( |
const gfx::Rect& anchor_in_root_view, |
const base::string16& main_text, |