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 c747a7a757324c489e17ca875e76a4684fed4138..c693002c27ae1fe8776f6a1988fdb12d825958ad 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
@@ -3500,18 +3500,11 @@ void WebViewImpl::PerformCustomContextMenuAction(unsigned action) { |
} |
void WebViewImpl::ShowContextMenu(WebMenuSourceType source_type) { |
- if (!GetPage()) |
+ if (!MainFrameImpl()) |
return; |
- GetPage()->GetContextMenuController().ClearContextMenu(); |
- { |
- ContextMenuAllowedScope scope; |
- if (LocalFrame* focused_frame = ToLocalFrame( |
- GetPage()->GetFocusController().FocusedOrMainFrame())) { |
- focused_frame->GetEventHandler().ShowNonLocatedContextMenu(nullptr, |
- source_type); |
- } |
- } |
+ // If MainFrameImpl() is non-null, then FrameWidget() will also be non-null. |
bokan
2017/05/26 14:41:58
Maybe make this a DCHECK?
|
+ MainFrameImpl()->FrameWidget()->ShowContextMenu(source_type); |
} |
void WebViewImpl::DidCloseContextMenu() { |