| 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 e6ee4cf2a1f398cd19129e468fd44eebe6cad981..eb78a823b79c319bdaa92990fb3c2394dad0afb0 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_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"
|
| @@ -284,9 +285,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),
|
| @@ -296,7 +296,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),
|
| @@ -327,6 +330,7 @@ WebContentsImpl::WebContentsImpl(
|
| is_subframe_(false),
|
| force_disable_overscroll_content_(false),
|
| last_dialog_suppressed_(false),
|
| + geolocation_service_context_(new GeolocationServiceContext()),
|
| accessibility_mode_(
|
| BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()),
|
| audio_stream_monitor_(this),
|
| @@ -1805,6 +1809,10 @@ RenderFrameHost* WebContentsImpl::GetGuestByInstanceID(
|
| return guest->GetMainFrame();
|
| }
|
|
|
| +GeolocationServiceContext* WebContentsImpl::GetGeolocationServiceContext() {
|
| + return geolocation_service_context_.get();
|
| +}
|
| +
|
| void WebContentsImpl::OnShowValidationMessage(
|
| const gfx::Rect& anchor_in_root_view,
|
| const base::string16& main_text,
|
|
|