Index: android_webview/browser/aw_browser_context.cc |
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc |
index c476fe835ce4a40b6c68ff52f8b1fd27074f50ba..e8b9dabb6f4dfd3d6b788c941e1176b00195af10 100644 |
--- a/android_webview/browser/aw_browser_context.cc |
+++ b/android_webview/browser/aw_browser_context.cc |
@@ -8,8 +8,11 @@ |
namespace android_webview { |
-AwBrowserContext::AwBrowserContext(const FilePath path) |
- : context_storage_path_(path) { |
+AwBrowserContext::AwBrowserContext( |
+ const FilePath path, |
+ content::GeolocationPermissionContext* geolocation_permission_context) |
+ : context_storage_path_(path), |
+ geolocation_permission_context_(geolocation_permission_context) { |
} |
AwBrowserContext::~AwBrowserContext() { |
@@ -75,10 +78,7 @@ AwBrowserContext::GetDownloadManagerDelegate() { |
content::GeolocationPermissionContext* |
AwBrowserContext::GetGeolocationPermissionContext() { |
- // TODO(boliu): Implement this to power WebSettings.setGeolocationEnabled |
- // setting. |
- NOTIMPLEMENTED(); |
- return NULL; |
+ return geolocation_permission_context_; |
} |
content::SpeechRecognitionPreferences* |