| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index b3a7d2462e2dc7f802deab26beb13f362e918d53..44e3690042eb6053436a9a73ce5e9ff818319798 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -497,7 +497,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // Returns true if the |event| passed in can be forwarded to the renderer.
|
| bool CanRendererHandleEvent(const ui::MouseEvent* event,
|
| bool mouse_locked,
|
| - bool selection_popup);
|
| + bool selection_popup) const;
|
|
|
| // Returns true when we can do SurfaceHitTesting for the event type.
|
| bool ShouldRouteEvent(const ui::Event* event) const;
|
| @@ -656,10 +656,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // exercise.
|
| bool legacy_window_destroyed_;
|
|
|
| - // Set to true when a context menu is being displayed. Reset to false when
|
| - // a mouse leave is received in this context.
|
| - bool showing_context_menu_;
|
| -
|
| // Contains a copy of the last context menu request parameters. Only set when
|
| // we receive a request to show the context menu on a long press.
|
| scoped_ptr<ContextMenuParams> last_context_menu_params_;
|
|
|