Implementing native chromium GeolocationPermissionContext

android_webview/browser/aw_browser_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 
 namespace android_webview {
 
-AwBrowserContext::AwBrowserContext(const FilePath path)
-    : context_storage_path_(path) {
+AwBrowserContext::AwBrowserContext(
+    const FilePath path,
+    GeolocationPermissionGetterFn* geolocation_permission_getter)
+    : context_storage_path_(path),
+      geolocation_permission_getter_(geolocation_permission_getter),
+      geolocation_permission_context_(NULL) {

[boliu_use_chromium_pls, 2013/01/04 23:45:43]

nit: scoped_refptr defaults constructs to NULL, so no need here

[Kristian Monsen, 2013/01/05 02:44:58]

Done.

 }
 
 AwBrowserContext::~AwBrowserContext() {
 }
 
 void AwBrowserContext::InitializeBeforeThreadCreation() {
   DCHECK(!url_request_context_getter_);
   url_request_context_getter_ = new AwURLRequestContextGetter(this);
 }
 
@@ skipping 45 matching lines @@
   return url_request_context_getter_->GetResourceContext();
 }
 
 content::DownloadManagerDelegate*
 AwBrowserContext::GetDownloadManagerDelegate() {
   return &download_manager_delegate_;
 }
 
 content::GeolocationPermissionContext*
 AwBrowserContext::GetGeolocationPermissionContext() {
-  // TODO(boliu): Implement this to power WebSettings.setGeolocationEnabled
-  // setting.
-  NOTIMPLEMENTED();
-  return NULL;
+  if (geolocation_permission_context_ == NULL) {

[boliu_use_chromium_pls, 2013/01/04 23:45:43]

nit: I believe you can just do if (!geolocation_permission_context_), but ask
compiler first :)

[Kristian Monsen, 2013/01/05 02:44:58]

Compiler agrees.

+    geolocation_permission_context_ = (*geolocation_permission_getter_)();
+  }
+  return geolocation_permission_context_;
 }
 
 content::SpeechRecognitionPreferences*
 AwBrowserContext::GetSpeechRecognitionPreferences() {
   // By default allows profanities in speech recognition if return NULL.
   return NULL;
 }
 
 quota::SpecialStoragePolicy* AwBrowserContext::GetSpecialStoragePolicy() {
   // TODO(boliu): Implement this so we are not relying on default behavior.
   NOTIMPLEMENTED();
   return NULL;
 }
 
 }  // namespace android_webview