Add ContextMenu support upstream for Android

chrome/browser/android/tab_android.h

Index: chrome/browser/android/tab_android.h
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 0cda9986655b945c7205a17c90d2476b74efcbb5..f56c40d4fa1ee2143b17d30b4dd22b0eb7320ef0 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -34,7 +34,6 @@ class ChromeWebContentsDelegateAndroid;
 
 namespace content {
 class ContentViewCore;
-struct ContextMenuParams;
 class WebContents;
 }
 
@@ -82,14 +81,6 @@ class TabAndroid : public CoreTabHelperDelegate,
                                          const string16& host,
                                          const string16& realm) = 0;
 
-  // Called to show the regular context menu that is triggered by a long press.
-  virtual void ShowContextMenu(const content::ContextMenuParams& params) = 0;
-
-  // Called to show a custom context menu. Used by the NTP.
-  virtual void ShowCustomContextMenu(
-      const content::ContextMenuParams& params,
-      const base::Callback<void(int)>& callback) = 0;
-
   // Called when context menu option to create the bookmark shortcut on
   // homescreen is called.
   virtual void AddShortcutToBookmark(
@@ -130,7 +121,8 @@ class TabAndroid : public CoreTabHelperDelegate,
                                jobject obj,
                                jboolean incognito,
                                jobject jcontent_view_core,
-                               jobject jweb_contents_delegate);
+                               jobject jweb_contents_delegate,
+                               jobject jcontext_menu_populator);
 
   virtual void DestroyWebContents(JNIEnv* env,
                                   jobject obj,
@@ -143,6 +135,11 @@ class TabAndroid : public CoreTabHelperDelegate,
                                            jstring jurl,
                                            jstring jtitle);
 
+  // TODO: Move out?

[Ted C, 2013/11/19 02:44:03]

seems a bit lacking

[David Trainor- moved to gerrit, 2013/11/25 19:42:50]

Done.

+  void OnContextMenuDownload(JNIEnv* env,
+                             jobject obj,
+                             jstring jurl,
+                             jboolean jis_link);
  protected:
   virtual ~TabAndroid();