[Android WebView] Convert context menu callback to long press

android_webview/lib/main/aw_main_delegate.cc

Index: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 7082797df069ab2dfe0882c9648740d7b7a5bac2..d4f91ee38c7e28c41820acbbdc0c9624b3284ee3 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -4,8 +4,8 @@
 
 #include "android_webview/lib/main/aw_main_delegate.h"
 
-#include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
+#include "android_webview/native/aw_web_contents_view_delegate.h"
 #include "android_webview/renderer/aw_content_renderer_client.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -14,8 +14,6 @@
 
 namespace android_webview {
 
-base::LazyInstance<AwContentBrowserClient>
-    g_webview_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<AwContentRendererClient>
     g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 
@@ -66,7 +64,12 @@ void AwMainDelegate::ProcessExiting(const std::string& process_type) {
 
 content::ContentBrowserClient*
     AwMainDelegate::CreateContentBrowserClient() {
-  return &g_webview_content_browser_client.Get();
+  if (!content_browser_client_) {

[joth, 2012/12/11 21:11:47]

I *think* this check is not needed. (you can DCHECK instead if you like).

see the version in  ash/shell/content_client/shell_main_delegate.cc

[boliu, 2012/12/11 22:13:10]

does the ash shell support multiple web_contents? Anyway, I guess it should be
safe. Let's see what the trybots say.

+    content_browser_client_.reset(
+        new AwContentBrowserClient(&AwWebContentsViewDelegate::Create));
+  }
+
+  return content_browser_client_.get();
 }
 
 content::ContentRendererClient*