Change to address default selection of menu item

ui/views/controls/menu/menu_runner.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_runner.h"
 
 #include <set>
 
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ skipping 141 matching lines @@
         // expected.
         return MenuRunner::NORMAL_EXIT;
       }
       // Drop menus don't block the message loop, so it's ok to create a new
       // MenuController.
       controller = NULL;
     }
   }
   running_ = true;
   for_drop_ = (types & MenuRunner::FOR_DROP) != 0;
+  bool root_context_menu = (MenuRunner::CONTEXT_MENU ==
+                  (types & (MenuRunner::IS_NESTED | MenuRunner::CONTEXT_MENU)));
   bool has_mnemonics = (types & MenuRunner::HAS_MNEMONICS) != 0 && !for_drop_;
   menu_->PrepareForRun(has_mnemonics,
-                       !for_drop_ && ShouldShowMnemonics(button));
+                       !for_drop_ && ShouldShowMnemonics(button),
+                       root_context_menu);
   int mouse_event_flags = 0;
   owns_controller_ = false;
   if (!controller) {
     // No menus are showing, show one.
     controller = new MenuController(!for_drop_, this);
     owns_controller_ = true;
   }
   controller_ = controller;
   menu_->set_controller(controller_);
 
   // Run the loop.
   MenuItemView* result = controller->Run(parent, button, menu_, bounds, anchor,

[sky, 2012/08/20 21:13:48]

Can root_context_menu be passed to Run instead? MenuController has a State
struct that this root_context_menu could be put in.

[Harry McCleave, 2012/08/21 01:30:18]

Done.

                                          &mouse_event_flags);
 
   if (for_drop_) {
     // Drop menus return immediately. We finish processing in DropMenuClosed.
     return MenuRunner::NORMAL_EXIT;
   }
 
   return MenuDone(result, mouse_event_flags);
 }
 
@@ skipping 101 matching lines @@
 
 bool MenuRunner::IsRunning() const {
   return holder_->running();
 }
 
 void MenuRunner::Cancel() {
   holder_->Cancel();
 }
 
 }  // namespace views