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

Index: android_webview/browser/aw_content_browser_client.cc
===================================================================
--- android_webview/browser/aw_content_browser_client.cc	(revision 192091)
+++ android_webview/browser/aw_content_browser_client.cc	(working copy)
@@ -26,8 +26,11 @@
 #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() { }
@@ -51,14 +54,22 @@
 
 }
 
-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) {
@@ -68,9 +79,11 @@
   }
   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,
@@ -83,10 +96,6 @@
     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());
@@ -151,15 +160,7 @@
 
 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() {
@@ -340,12 +341,6 @@
   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());