Selects last item in a menu when pressing 'up' initially

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 33 matching lines @@
 class SubmenuView;
 class View;
 
 namespace internal {
 class MenuControllerDelegate;
 class MenuEventDispatcher;
 class MenuMessagePumpDispatcher;
 class MenuRunnerImpl;
 }
 
+namespace test {
+class MenuControllerTest;
+}
+
 // MenuController -------------------------------------------------------------
 
 // MenuController is used internally by the various menu classes to manage
 // showing, selecting and drag/drop for menus. All relevant events are
 // forwarded to the MenuController from SubmenuView and MenuHost.
 class VIEWS_EXPORT MenuController : public WidgetObserver {
  public:
   // Enumeration of how the menu should exit.
   enum ExitType {
     // Don't exit.
@@ skipping 112 matching lines @@
   // Only used for testing.
   bool IsCancelAllTimerRunningForTest();
 
   // Only used for testing.
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
   friend class internal::MenuEventDispatcher;
   friend class internal::MenuMessagePumpDispatcher;
   friend class internal::MenuRunnerImpl;
-  friend class MenuControllerTest;
+  friend class test::MenuControllerTest;
   friend class MenuHostRootView;
   friend class MenuItemView;
   friend class SubmenuView;
 
   class MenuScrollTask;
 
   struct SelectByCharDetails;
 
   // Values supplied to SetSelection.
   enum SetSelectionTypes {
@@ skipping 16 matching lines @@
     // Accelerator is not sent because of no hot tracked views.
     ACCELERATOR_NOT_PROCESSED,
 
     // Accelerator is sent to the hot tracked views.
     ACCELERATOR_PROCESSED,
 
     // Same as above and the accelerator causes the exit of the menu.
     ACCELERATOR_PROCESSED_EXIT
   };
 
+  // Direction for IncrementSelection and FindInitialSelectableMenuItem.
+  enum SelectionIncrementDirectionType {
+    // Navigate the menu up.
+    INCREMENT_SELECTION_UP,
+
+    // Navigate the menu down.
+    INCREMENT_SELECTION_DOWN,
+  };
+
   // Tracks selection information.
   struct State {
     State();
     ~State();
 
     // The selected menu item.
     MenuItemView* item;
 
     // If item has a submenu this indicates if the submenu is showing.
     bool submenu_open;
@@ skipping 192 matching lines @@
 
   // Calculates the bubble bounds of the menu to show. is_leading is set to
   // match the direction the menu opened in.
   gfx::Rect CalculateBubbleMenuBounds(MenuItemView* item,
                                       bool prefer_leading,
                                       bool* is_leading);
 
   // Returns the depth of the menu.
   static int MenuDepth(MenuItemView* item);
 
-  // Selects the next/previous menu item.
-  void IncrementSelection(int delta);
+  // Selects the next or previous (depending on |direction|) menu item.
+  void IncrementSelection(SelectionIncrementDirectionType direction);
 
-  // Returns the first selectable child menu item of |parent|. If there are no
-  // selectable menu items NULL is returned.
-  MenuItemView* FindFirstSelectableMenuItem(MenuItemView* parent);
+  // Returns the first (|direction| == NAVIGATE_SELECTION_DOWN) or the last
+  // (|direction| == INCREMENT_SELECTION_UP) selectable child menu item of
+  // |parent|. If there are no selectable items returns NULL.
+  MenuItemView* FindInitialSelectableMenuItem(
+      MenuItemView* parent,
+      SelectionIncrementDirectionType direction);
 
-  // Returns the next selectable child menu item of |parent| starting at |index|
-  // and incrementing index by |delta|. If there are no more selectable menu
-  // items NULL is returned.
-  MenuItemView* FindNextSelectableMenuItem(MenuItemView* parent,
-                                           int index,
-                                           int delta);
+  // Returns the next or previous selectable child menu item of |parent|
+  // starting at |index| and incrementing or decrementing index by 1 depending
+  // on |direction|. If there are no more selectable items NULL is returned.
+  MenuItemView* FindNextSelectableMenuItem(
+      MenuItemView* parent,
+      int index,
+      SelectionIncrementDirectionType direction);
 
   // If the selected item has a submenu and it isn't currently open, the
   // the selection is changed such that the menu opens immediately.
   void OpenSubmenuChangeSelectionIfCan();
 
   // If possible, closes the submenu.
   void CloseSubmenu();
 
   // Returns details about which menu items match the mnemonic |key|.
   // |match_function| is used to determine which menus match.
@@ skipping 182 matching lines @@
   bool item_selected_by_touch_;
 
   scoped_ptr<MenuMessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_