views: Make sure the event flags are used correctly for all events that select a menu item.

ui/views/controls/menu/menu_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 60 matching lines @@
 
   // Runs the menu at the specified location. If the menu was configured to
   // block, the selected item is returned. If the menu does not block this
   // returns NULL immediately.
   MenuItemView* Run(Widget* parent,
                     MenuButton* button,
                     MenuItemView* root,
                     const gfx::Rect& bounds,
                     MenuItemView::AnchorPosition position,
                     bool context_menu,
-                    int* mouse_event_flags);
+                    int* event_flags);
 
   // Whether or not Run blocks.
   bool IsBlockingRun() const { return blocking_run_; }
 
   // Whether or not drag operation is in progress.
   bool drag_in_progress() const { return drag_in_progress_; }
 
   // Cancels the current Run. See ExitType for a description of what happens
   // with the various parameters.
   void Cancel(ExitType type);
@@ skipping 176 matching lines @@
 
   // AcceleratorPressed is invoked on the hot tracked view if it exists.
   SendAcceleratorResultType SendAcceleratorToHotTrackedView();
 
   void UpdateInitialLocation(const gfx::Rect& bounds,
                              MenuItemView::AnchorPosition position,
                              bool context_menu);
 
   // Invoked when the user accepts the selected item. This is only used
   // when blocking. This schedules the loop to quit.
-  void Accept(MenuItemView* item, int mouse_event_flags);
+  void Accept(MenuItemView* item, int event_flags);
 
   bool ShowSiblingMenu(SubmenuView* source, const gfx::Point& mouse_location);
 
   // Shows a context menu for |menu_item| as a result of a located event if
   // appropriate. This is invoked on long press and releasing the right mouse
   // button. Returns whether a context menu was shown.
   bool ShowContextMenu(MenuItemView* menu_item,
                        SubmenuView* source,
                        const ui::LocatedEvent& event);
 
@@ skipping 194 matching lines @@
   // pending_state_ is committed to state_, potentially resulting in
   // opening or closing submenus. This gives a slight delayed effect to
   // submenus as the user moves the mouse around. This is done so that as the
   // user moves the mouse all submenus don't immediately pop.
   State pending_state_;
   State state_;
 
   // If the user accepted the selection, this is the result.
   MenuItemView* result_;
 
-  // The mouse event flags when the user clicked on a menu. Is 0 if the
-  // user did not use the mouse to select the menu.
-  int result_mouse_event_flags_;
+  // The event flags when the user selected the menu.
+  int accept_event_flags_;
 
   // If not empty, it means we're nested. When Run is invoked from within
   // Run, the current state (state_) is pushed onto menu_stack_. This allows
   // MenuController to restore the state when the nested run returns.
   std::list<State> menu_stack_;
 
   // As the mouse moves around submenus are not opened immediately. Instead
   // they open after this timer fires.
   base::OneShotTimer<MenuController> show_timer_;
 
@@ skipping 46 matching lines @@
   int message_loop_depth_;
 
   views::MenuConfig menu_config_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_