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

ui/views/controls/menu/menu_item_view.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 219 matching lines @@
     int item_id,
     const base::string16& label,
     const base::string16& sublabel,
     const base::string16& minor_text,
     const gfx::ImageSkia& icon,
     Type type,
     ui::MenuSeparatorType separator_style) {
   DCHECK_NE(type, EMPTY);
   DCHECK_LE(0, index);
   if (!submenu_)
-    CreateSubmenu();
+    submenu_ = CreateSubmenu();
   DCHECK_GE(submenu_->child_count(), index);
   if (type == SEPARATOR) {
     submenu_->AddChildViewAt(new MenuSeparator(this, separator_style), index);
     return NULL;
   }
   MenuItemView* item = new MenuItemView(this, item_id, type);
   if (label.empty() && GetDelegate())
     item->SetTitle(GetDelegate()->GetLabel(item_id));
   else
     item->SetTitle(label);
   item->SetSubtitle(sublabel);
   item->SetMinorText(minor_text);
   if (!icon.isNull())
     item->SetIcon(icon);
-  if (type == SUBMENU)
-    item->CreateSubmenu();
+  if (type == SUBMENU && !item->HasSubmenu())
+    item->submenu_ = CreateSubmenu();
   if (GetDelegate() && !GetDelegate()->IsCommandVisible(item_id))
     item->SetVisible(false);
   submenu_->AddChildViewAt(item, index);
   return item;
 }
 
 void MenuItemView::RemoveMenuItemAt(int index) {
   DCHECK(submenu_);
   DCHECK_LE(0, index);
   DCHECK_GT(submenu_->child_count(), index);
@@ skipping 57 matching lines @@
     const base::string16& minor_text,
     const gfx::ImageSkia& icon,
     Type type,
     ui::MenuSeparatorType separator_style) {
   const int index = submenu_ ? submenu_->child_count() : 0;
   return AddMenuItemAt(index, item_id, label, sublabel, minor_text, icon, type,
                        separator_style);
 }
 
 SubmenuView* MenuItemView::CreateSubmenu() {
-  if (!submenu_)
-    submenu_ = new SubmenuView(this);
-  return submenu_;
+  return new SubmenuView(this);
 }
 
 bool MenuItemView::HasSubmenu() const {
   return (submenu_ != NULL);
 }
 
 SubmenuView* MenuItemView::GetSubmenu() const {
   return submenu_;
 }
 
@@ skipping 312 matching lines @@
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
 void MenuItemView::PrepareForRun(bool is_first_menu,
                                  bool has_mnemonics,
                                  bool show_mnemonics) {
   // Currently we only support showing the root.
   DCHECK(!parent_menu_item_);
 
   // Force us to have a submenu.
-  CreateSubmenu();
+  if (!submenu_)
+    submenu_ = CreateSubmenu();
   actual_menu_position_ = requested_menu_position_;
   canceled_ = false;
 
   has_mnemonics_ = has_mnemonics;
   show_mnemonics_ = has_mnemonics && show_mnemonics;
 
   AddEmptyMenus();
 
   if (is_first_menu) {
     // Only update the menu size if there are no menus showing, otherwise
@@ skipping 393 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views