| Index: views/controls/menu/menu_host_root_view.h
|
| diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h
|
| index b8b8e34ececad4a7efcdb98c9f93ef1d5471ac6e..ccd52471c6b8cbab32e4361fd81ed0cbc66aa1dc 100644
|
| --- a/views/controls/menu/menu_host_root_view.h
|
| +++ b/views/controls/menu/menu_host_root_view.h
|
| @@ -23,15 +23,11 @@ class MenuHostRootView : public RootView {
|
| public:
|
| MenuHostRootView(Widget* widget, SubmenuView* submenu);
|
|
|
| - // When invoked subsequent events are NOT forwarded to the MenuController.
|
| - void suspend_events() { suspend_events_ = true; }
|
| -
|
| // Overridden from View:
|
| virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
|
| virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const MouseEvent& event, bool canceled) OVERRIDE;
|
| + virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;
|
| virtual bool OnMouseWheel(const MouseWheelEvent& event) OVERRIDE;
|
|
|
| private:
|
| @@ -44,10 +40,6 @@ class MenuHostRootView : public RootView {
|
| // Whether mouse dragged/released should be forwarded to the MenuController.
|
| bool forward_drag_to_menu_controller_;
|
|
|
| - // Whether events are suspended. If true, no events are forwarded to the
|
| - // MenuController.
|
| - bool suspend_events_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MenuHostRootView);
|
| };
|
|
|
|
|