Context Menu Refactor

chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc

Index: chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc
diff --git a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc
index a97f3f16d79115c802f01f81a78ecf333f073718..b39d7281247246b647c26ee5d7acd97ec158f5e5 100644
--- a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc
+++ b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc
@@ -30,22 +30,13 @@ ChromeWebContentsViewDelegateAndroid::GetDragDestDelegate() {
 void ChromeWebContentsViewDelegateAndroid::ShowContextMenu(
     content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
-  // Display paste pop-up only when selection is empty and editable.
-  if (params.is_editable && params.selection_text.empty()) {
-    content::ContentViewCore* content_view_core =
-        content::ContentViewCore::FromWebContents(web_contents_);
-    if (content_view_core &&
-        content_view_core->ShowPastePopup(params.selection_start.x(),
-                                          params.selection_start.y()))
-      return;
-  } else {
-    // TODO(dtrainor, kouhei): Give WebView a Populator/delegate so it can use
-    // the same context menu code.
-    ContextMenuHelper* helper =
-        ContextMenuHelper::FromWebContents(web_contents_);
-    if (helper && helper->ShowContextMenu(render_frame_host, params))
-      return;
-  }
+  // TODO(dtrainor, kouhei): Give WebView a Populator/delegate so it can use
+  // the same context menu code.

[no sievers, 2016/06/23 23:16:41]

Isn't this TODO addressed now or what does WebView still do differently?

[amaralp, 2016/06/24 00:45:49]

I don't understand what this TODO means. Previously WebView just omitted 
the else statement. My understanding is that WebView doesn't ever create
this type of menu. I don't know where the Populator/delegate would be used.

[no sievers, 2016/06/24 22:17:24]

Ok I'd just remove the comment then. It seems like the code would be unified
enough now.

+  ContextMenuHelper* helper =
+      ContextMenuHelper::FromWebContents(web_contents_);
+  if (helper && helper->ShowContextMenu(render_frame_host, params))
+    return;
+
   web_contents_->NotifyContextMenuClosed(content::CustomContextMenuContext());
 }