Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc

Issue 2360103002: Removing unnecessary context menu logic (Closed)
Patch Set: fixed nits Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..5d226806759ceee2097986856df8c6cfbdce591f 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 &&
- 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;
+ if (content_view_core) {
+ content_view_core->ShowPastePopup(params.selection_start.x(),
+ params.selection_start.y());
+ }
+ return;
}
- 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 {

Powered by Google App Engine
This is Rietveld 408576698