| Index: chrome/browser/profile.cc
|
| diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
|
| index c78b64a161ad36ebf578b1d30fcea46ad2dea04b..b588b6143ed463c00847985243d20e478f3e789d 100644
|
| --- a/chrome/browser/profile.cc
|
| +++ b/chrome/browser/profile.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/extensions/extensions_service.h"
|
| #include "chrome/browser/extensions/user_script_master.h"
|
| #include "chrome/browser/favicon_service.h"
|
| +#include "chrome/browser/geolocation/geolocation_permission_context.h"
|
| #include "chrome/browser/spellcheck_host.h"
|
| #include "chrome/browser/transport_security_persister.h"
|
| #include "chrome/browser/history/history.h"
|
| @@ -403,6 +404,10 @@ class OffTheRecordProfileImpl : public Profile,
|
| return profile_->GetHostContentSettingsMap();
|
| }
|
|
|
| + virtual GeolocationPermissionContext* GetGeolocationPermissionContext() {
|
| + return profile_->GetGeolocationPermissionContext();
|
| + }
|
| +
|
| virtual HostZoomMap* GetHostZoomMap() {
|
| return profile_->GetHostZoomMap();
|
| }
|
| @@ -978,6 +983,14 @@ HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
|
| return host_content_settings_map_.get();
|
| }
|
|
|
| +GeolocationPermissionContext* ProfileImpl::GetGeolocationPermissionContext() {
|
| + if (!geolocation_permission_context_.get()) {
|
| + geolocation_permission_context_ =
|
| + new GeolocationPermissionContext(GetHostContentSettingsMap());
|
| + }
|
| + return geolocation_permission_context_.get();
|
| +}
|
| +
|
| HostZoomMap* ProfileImpl::GetHostZoomMap() {
|
| if (!host_zoom_map_)
|
| host_zoom_map_ = new HostZoomMap(this);
|
|
|