Removing unnecessary context menu logic

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..33d0fef891c1adf3fb4cc3e5a55e1168e239f32f 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
@@ -34,19 +34,19 @@ void ChromeWebContentsViewDelegateAndroid::ShowContextMenu(
   if (params.is_editable && params.selection_text.empty()) {
     content::ContentViewCore* content_view_core =
         content::ContentViewCore::FromWebContents(web_contents_);
-    if (content_view_core &&
+    if (content_view_core) {
         content_view_core->ShowPastePopup(params.selection_start.x(),

[Ted C, 2016/09/22 21:46:39]

decrease indent by two

[amaralp, 2016/09/22 22:03:29]

Done.

-                                          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;
+                                          params.selection_start.y());
+        return;

[Ted C, 2016/09/22 21:46:38]

Since we're changing this, I think we should put the return outside the
content_view_core_ check, we wouldn't want to attempt to show a context menu in
this case.

-2 indent as well

[amaralp, 2016/09/22 22:03:29]

Done.

+    }
   }
-  web_contents_->NotifyContextMenuClosed(content::CustomContextMenuContext());
+
+  // 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);
 }
 
 namespace chrome {