Implement WebStorage API methods

android_webview/browser/aw_content_browser_client.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_content_browser_client.h"
 
+#include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/aw_quota_permission_context.h"
+#include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/url_constants.h"
 #include "base/android/locale_utils.h"
 #include "base/base_paths_android.h"
 #include "base/path_service.h"
 #include "content/public/browser/access_token_store.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 22 matching lines @@
  private:
   virtual ~AwAccessTokenStore() { }
 
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
 }
 
 namespace android_webview {
 
+// static
+AwContentBrowserClient* AwContentBrowserClient::FromContentBrowserClient(
+    content::ContentBrowserClient* client) {
+  return static_cast<AwContentBrowserClient*>(client);
+}
+
 AwContentBrowserClient::AwContentBrowserClient(
-    ViewDelegateFactoryFn* view_delegate_factory,
-    GeolocationPermissionFactoryFn* geolocation_permission_factory)
-    : view_delegate_factory_(view_delegate_factory) {
+    JniDependencyFactory* native_factory)
+    : native_factory_(native_factory) {
   base::FilePath user_data_dir;
   if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
     NOTREACHED() << "Failed to get app data directory for Android WebView";
   }
   browser_context_.reset(
-      new AwBrowserContext(user_data_dir, geolocation_permission_factory));
+      new AwBrowserContext(user_data_dir, native_factory_));
 }
 
 AwContentBrowserClient::~AwContentBrowserClient() {
 }
 
 void AwContentBrowserClient::AddCertificate(net::URLRequest* request,
                                             net::CertificateMimeType cert_type,
                                             const void* cert_data,
                                             size_t cert_size,
                                             int render_process_id,
                                             int render_view_id) {
   if (cert_size > 0)
     net::android::StoreCertificate(cert_type, cert_data, cert_size);
 }
 
 AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() {
   return browser_context_.get();
 }
 
 content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   return new AwBrowserMainParts(browser_context_.get());
 }
 
 content::WebContentsViewDelegate*
 AwContentBrowserClient::GetWebContentsViewDelegate(
     content::WebContents* web_contents) {
-  return (*view_delegate_factory_)(web_contents);
+  return native_factory_->CreateViewDelegate(web_contents);
 }
 
 void AwContentBrowserClient::RenderProcessHostCreated(
     content::RenderProcessHost* host) {
   // If WebView becomes multi-process capable, this may be insecure.
   // More benefit can be derived from the ChildProcessSecurotyPolicy by
   // deferring the GrantScheme calls until we know that a given child process
   // really does need that priviledge. Check here to ensure we rethink this
   // when the time comes. See crbug.com/156062.
   CHECK(content::RenderProcessHost::run_renderer_in_process());
@@ skipping 285 matching lines @@
 
 bool AwContentBrowserClient::AllowPepperSocketAPI(
     content::BrowserContext* browser_context,
     const GURL& url,
     const content::SocketPermissionRequest& params) {
   NOTREACHED() << "Android WebView does not support plugins";
   return false;
 }
 
 }  // namespace android_webview