Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

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_contents_client_bridge_base.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"
 #include "content/public/common/url_constants.h"
 #include "grit/ui_resources.h"
 #include "net/android/network_library.h"
 #include "net/ssl/ssl_info.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace android_webview {
 namespace {
 
+AwBrowserContext* g_browser_context;

[joth, 2013/04/03 23:43:44]

Rather than stash this as a global here, it would be better to move the
singleton instance to be a member of another singleton, e.g. AwMainDelegate, and
pass into AwContentBrowserClient as another c'tor param. 

It would also need passing into
AwBrowserDependencyFactoryImpl::InstallInstance() and then things like quota
manager would get it via
AwBrowserDependencyFactory::GetInstance()->GetBrowserContext().
(aside: AwBrowserDependencyFactory is mostly obsolete now we no longer have
egregious dependencies from android_webview to chrome, so maybe cleaner I just
delete it than try and clean it)

If you agree with the approach but don't want to pull more files/iterations into
this patch (it's already pretty large) feel free to put a TODO(joth): here for
it and ping me when you land this and I'm happy to follow up on that.

[jam, 2013/04/04 02:46:10]

That would be great if you can help with that, thanks.

+
 class AwAccessTokenStore : public content::AccessTokenStore {
  public:
   AwAccessTokenStore() { }
 
   // content::AccessTokenStore implementation
   virtual void LoadAccessTokens(
       const LoadAccessTokensCallbackType& request) OVERRIDE {
     AccessTokenStore::AccessTokenSet access_token_set;
     // AccessTokenSet and net::URLRequestContextGetter not used on Android,
     // but Run needs to be called to finish the geolocation setup.
     request.Run(access_token_set, NULL);
   }
   virtual void SaveAccessToken(const GURL& server_url,
                                const string16& access_token) OVERRIDE { }
 
  private:
   virtual ~AwAccessTokenStore() { }
 
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
 }
 
-namespace android_webview {
+std::string AwContentBrowserClient::GetAcceptLangsImpl() {
+  // Start with the currnet locale.
+  std::string langs = base::android::GetDefaultLocale();
 
-// static
-AwContentBrowserClient* AwContentBrowserClient::FromContentBrowserClient(
-    content::ContentBrowserClient* client) {
-  return static_cast<AwContentBrowserClient*>(client);
+  // If we're not en-US, add in en-US which will be
+  // used with a lower q-value.
+  if (StringToLowerASCII(langs) != "en-us") {
+    langs += ",en-US";
+  }
+  return langs;
+}
+
+AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() {
+  return g_browser_context;
 }
 
 AwContentBrowserClient::AwContentBrowserClient(
     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, native_factory_));
+  g_browser_context = browser_context_.get();
 }
 
 AwContentBrowserClient::~AwContentBrowserClient() {
+  g_browser_context = NULL;
 }
 
 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 native_factory_->CreateViewDelegate(web_contents);
 }
@@ skipping 44 matching lines @@
     int child_process_id) {
   NOTREACHED() << "Android WebView does not support multi-process yet";
 }
 
 std::string AwContentBrowserClient::GetApplicationLocale() {
   return base::android::GetDefaultLocale();
 }
 
 std::string AwContentBrowserClient::GetAcceptLangs(
     content::BrowserContext* context) {
-  // Start with the currnet locale.
-  std::string langs = GetApplicationLocale();
-
-  // If we're not en-US, add in en-US which will be
-  // used with a lower q-value.
-  if (StringToLowerASCII(langs) != "en-us") {
-    langs += ",en-US";
-  }
-  return langs;
+  return GetAcceptLangsImpl();
 }
 
 gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // TODO(boliu): Bundle our own default favicon?
   return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
 }
 
 bool AwContentBrowserClient::AllowAppCache(const GURL& manifest_url,
                            const GURL& first_party,
@@ skipping 160 matching lines @@
 }
 
 void AwContentBrowserClient::UpdateInspectorSetting(
     content::RenderViewHost* rvh,
     const std::string& key,
     const std::string& value) {
   // TODO(boliu): Implement persisting inspector settings.
   NOTIMPLEMENTED();
 }
 
-void AwContentBrowserClient::ClearInspectorSettings(
-    content::RenderViewHost* rvh) {
-  // TODO(boliu): Implement persisting inspector settings.
-  NOTIMPLEMENTED();
-}
-
 void AwContentBrowserClient::ClearCache(content::RenderViewHost* rvh) {
   RemoveHttpDiskCache(rvh->GetProcess()->GetBrowserContext(),
                       rvh->GetProcess()->GetID());
 }
 
 void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) {
   // TODO(boliu): Implement.
   NOTIMPLEMENTED();
 }
 
@@ skipping 18 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