Chromium Code Reviews| 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 8cc7d34fdd4e19c7c383787aadecacf3ba504892..d11848e523428ad92b3a061e6c145f3a4341370d 100644 |
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
| @@ -53,6 +53,7 @@ |
| #include "core/events/WheelEvent.h" |
| #include "core/exported/WebPluginContainerBase.h" |
| #include "core/frame/BrowserControls.h" |
| +#include "core/frame/ContextMenuAllowedScope.h" |
| #include "core/frame/EventHandlerRegistry.h" |
| #include "core/frame/FrameView.h" |
| #include "core/frame/LocalFrame.h" |
| @@ -161,7 +162,6 @@ |
| #include "web/AnimationWorkletProxyClientImpl.h" |
| #include "web/CompositorMutatorImpl.h" |
| #include "web/CompositorWorkerProxyClientImpl.h" |
| -#include "web/ContextMenuAllowedScope.h" |
| #include "web/DedicatedWorkerMessagingProxyProviderImpl.h" |
| #include "web/DevToolsEmulator.h" |
| #include "web/FullscreenController.h" |
| @@ -3507,16 +3507,7 @@ void WebViewImpl::PerformCustomContextMenuAction(unsigned action) { |
| } |
| void WebViewImpl::ShowContextMenu() { |
| - if (!GetPage()) |
| - return; |
| - |
| - GetPage()->GetContextMenuController().ClearContextMenu(); |
| - { |
| - ContextMenuAllowedScope scope; |
| - if (LocalFrame* focused_frame = |
| - ToLocalFrame(GetPage()->GetFocusController().FocusedOrMainFrame())) |
| - focused_frame->GetEventHandler().SendContextMenuEventForKey(nullptr); |
| - } |
| + NOTREACHED(); |
|
EhsanK
2017/05/23 22:31:23
To me it looks like this could in fact hit. Here i
wjmaclean
2017/05/24 13:05:52
So then, would the previous patchset of this CL, i
|
| } |
| void WebViewImpl::DidCloseContextMenu() { |