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

Side by Side Diff: android_webview/native/aw_web_contents_view_delegate.cc

Issue 1471993002: Resume cursor blinking on closing context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: robusted onContextMenuClosed() and fixed nits Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/native/aw_web_contents_view_delegate.h" 5 #include "android_webview/native/aw_web_contents_view_delegate.h"
6 6
7 #include "content/public/browser/android/content_view_core.h" 7 #include "content/public/browser/android/content_view_core.h"
8 #include "content/public/browser/web_contents.h" 8 #include "content/public/browser/web_contents.h"
9 #include "content/public/common/context_menu_params.h" 9 #include "content/public/common/context_menu_params.h"
10 10
(...skipping 25 matching lines...) Expand all
36 content::RenderFrameHost* render_frame_host, 36 content::RenderFrameHost* render_frame_host,
37 const content::ContextMenuParams& params) { 37 const content::ContextMenuParams& params) {
38 // TODO(boliu): Large blocks of this function are identical with 38 // TODO(boliu): Large blocks of this function are identical with
39 // ChromeWebContentsViewDelegateAndroid::ShowContextMenu. De-dup this if 39 // ChromeWebContentsViewDelegateAndroid::ShowContextMenu. De-dup this if
40 // possible. 40 // possible.
41 41
42 // Display paste pop-up only when selection is empty and editable. 42 // Display paste pop-up only when selection is empty and editable.
43 if (params.is_editable && params.selection_text.empty()) { 43 if (params.is_editable && params.selection_text.empty()) {
44 content::ContentViewCore* content_view_core = 44 content::ContentViewCore* content_view_core =
45 content::ContentViewCore::FromWebContents(web_contents_); 45 content::ContentViewCore::FromWebContents(web_contents_);
46 if (content_view_core) { 46 if (content_view_core &&
47 content_view_core->ShowPastePopup(params.selection_start.x(), 47 content_view_core->ShowPastePopup(params.selection_start.x(),
48 params.selection_start.y()); 48 params.selection_start.y())) {
49 return;
49 } 50 }
50 } 51 }
52 web_contents_->NotifyContextMenuClosed(content::CustomContextMenuContext());
51 } 53 }
52 54
53 } // namespace android_webview 55 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698