Change to address default selection of 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 68 matching lines @@
   static MenuController* GetActiveInstance();
 
   // 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);
 
   // 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.
@@ skipping 92 matching lines @@
     gfx::Rect initial_bounds;
 
     // Position of the initial menu.
     MenuItemView::AnchorPosition anchor;
 
     // The direction child menus have opened in.
     std::list<bool> open_leading;
 
     // Bounds for the monitor we're showing on.
     gfx::Rect monitor_bounds;
+
+    // Is the current menu a context menu.
+    bool context_menu;
   };
 
   // Used by GetMenuPart to indicate the menu part at a particular location.
   struct MenuPart {
     // Type of part.
     enum Type {
       NONE,
       MENU_ITEM,
       SCROLL_UP,
       SCROLL_DOWN
@@ skipping 50 matching lines @@
   // Creates a MenuController. If |blocking| is true a nested message loop is
   // started in |Run|.
   MenuController(bool blocking, internal::MenuControllerDelegate* delegate);
 
   virtual ~MenuController();
 
   // AcceleratorPressed is invoked on the hot tracked view if it exists.
   SendAcceleratorResultType SendAcceleratorToHotTrackedView();
 
   void UpdateInitialLocation(const gfx::Rect& bounds,
-                             MenuItemView::AnchorPosition position);
+                             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);
 
   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.
@@ skipping 270 matching lines @@
   // How deep we are in nested message loops. This should be at most 2 (when
   // showing a context menu from a menu).
   int message_loop_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_