| Index: third_party/WebKit/Source/web/WebViewImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| index 32bfe0a1f7bd6404309540f6d3822ce589191ca1..9f864af506553e09061a1e8c3aabc00bec2bcab5 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| @@ -3506,16 +3506,18 @@ void WebViewImpl::PerformCustomContextMenuAction(unsigned action) {
|
| page_->GetContextMenuController().ClearContextMenu();
|
| }
|
|
|
| -void WebViewImpl::ShowContextMenu() {
|
| +void WebViewImpl::ShowContextMenu(bool from_touch_handle) {
|
| if (!GetPage())
|
| return;
|
|
|
| GetPage()->GetContextMenuController().ClearContextMenu();
|
| {
|
| ContextMenuAllowedScope scope;
|
| - if (LocalFrame* focused_frame =
|
| - ToLocalFrame(GetPage()->GetFocusController().FocusedOrMainFrame()))
|
| - focused_frame->GetEventHandler().SendContextMenuEventForKey(nullptr);
|
| + if (LocalFrame* focused_frame = ToLocalFrame(
|
| + GetPage()->GetFocusController().FocusedOrMainFrame())) {
|
| + focused_frame->GetEventHandler().SendContextMenuEventForKey(
|
| + nullptr, from_touch_handle);
|
| + }
|
| }
|
| }
|
|
|
|
|