Move ContextMenu show/hide state tracking to WebContents

content/browser/renderer_host/render_widget_host_view_event_handler.cc

Index: content/browser/renderer_host/render_widget_host_view_event_handler.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_event_handler.cc b/content/browser/renderer_host/render_widget_host_view_event_handler.cc
index 0401ce699cc82e53ffd698e046c6a9d32fac574a..5cb51cb27e987207a7cbb3b465c3ae65af99bc86 100644
--- a/content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ b/content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -35,6 +35,10 @@
 #include "ui/display/screen.h"
 #endif  // defined(OS_WIN)
 
+#if defined(USE_AURA)
+#include "content/browser/renderer_host/render_widget_host_view_aura.h"

[kenrb, 2017/06/05 17:39:16]

It doesn't look like this is needed.

[EhsanK, 2017/06/06 12:34:46]

Uh thanks for finding this. Left over from WIP phase.

+#endif
+
 namespace {
 
 // In mouse lock mode, we need to prevent the (invisible) cursor from hitting
@@ -577,7 +581,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHandleEvent(
     // Don't forward the mouse leave message which is received when the context
     // menu is displayed by the page. This confuses the page and causes state
     // changes.
-    if (host_view_->IsShowingContextMenu())
+    if (host_->delegate() && host_->delegate()->IsShowingContextMenuOnPage())
       return false;
 #endif
     return true;