Add ContextMenu support upstream for Android

chrome/browser/android/tab_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/jni_helper.h"
@@ skipping 16 matching lines @@
 }
 
 namespace chrome {
 namespace android {
 class ChromeWebContentsDelegateAndroid;
 }
 }
 
 namespace content {
 class ContentViewCore;
-struct ContextMenuParams;
 class WebContents;
 }
 
 class TabAndroid : public CoreTabHelperDelegate,
                    public content::NotificationObserver {
  public:
   // Convenience method to retrieve the Tab associated with the passed
   // WebContents.  Can return NULL.
   static TabAndroid* FromWebContents(content::WebContents* web_contents);
 
@@ skipping 27 matching lines @@
   browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() const;
 
   void SetSyncId(int sync_id);
 
   virtual void HandlePopupNavigation(chrome::NavigateParams* params) = 0;
 
   virtual void OnReceivedHttpAuthRequest(jobject auth_handler,
                                          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(
       const GURL& url, const string16& title, const SkBitmap& skbitmap,
       int r_value, int g_value, int b_value) = 0;
 
   // Called when a bookmark node should be edited.
   virtual void EditBookmark(int64 node_id,
                             const base::string16& node_title,
                             bool is_folder,
@@ skipping 20 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Methods called from Java via JNI -----------------------------------------
 
   virtual void InitWebContents(JNIEnv* env,
                                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,
                                   jboolean delete_native);
   base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env,
                                                                jobject obj);
   ToolbarModel::SecurityLevel GetSecurityLevel(JNIEnv* env, jobject obj);
   void SetActiveNavigationEntryTitleForUrl(JNIEnv* env,
                                            jobject obj,
                                            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();
 
  private:
   JavaObjectWeakGlobalRef weak_java_tab_;
 
   SessionID session_tab_id_;
 
   content::NotificationRegistrar notification_registrar_;
 
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_