Move ContextMenu show/hide state tracking to WebContents

content/browser/renderer_host/render_widget_host_view_event_handler.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "content/browser/renderer_host/input/touch_selection_controller_client_aura.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
@@ skipping 17 matching lines @@
 #include "ui/events/blink/web_input_event.h"
 #include "ui/touch_selection/touch_selection_controller.h"
 
 #if defined(OS_WIN)
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/public/common/context_menu_params.h"
 #include "ui/aura/window_tree_host.h"
 #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
 // the border of the view, in order to get valid movement information. However,
 // forcing the cursor back to the center of the view after each mouse move
 // doesn't work well. It reduces the frequency of useful mouse move messages
 // significantly. Therefore, we move the cursor to the center of the view only
 // if it approaches the border. |kMouseLockBorderPercentage| specifies the width
 // of the border area, in percentage of the corresponding dimension.
 const int kMouseLockBorderPercentage = 15;
@@ skipping 522 matching lines @@
   if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED)
     return false;
 
   if (event->type() == ui::ET_MOUSE_EXITED) {
     if (mouse_locked || selection_popup)
       return false;
 #if defined(OS_WIN) || defined(OS_LINUX)
     // 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;
   }
 
 #if defined(OS_WIN)
   // Renderer cannot handle WM_XBUTTON or NC events.
   switch (event->native_event().message) {
     case WM_XBUTTONDOWN:
     case WM_XBUTTONUP:
@@ skipping 362 matching lines @@
     bool non_zero_delta =
         mouse_wheel_event.delta_x || mouse_wheel_event.delta_y;
     mouse_wheel_event.phase = non_zero_delta
                                   ? blink::WebMouseWheelEvent::kPhaseChanged
                                   : blink::WebMouseWheelEvent::kPhaseStationary;
     mouse_wheel_end_dispatch_timer_.Reset();
   }
 }
 
 }  // namespace content