Change to address default selection of menu item

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/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 71 matching lines @@
     : delegate_(delegate),
       controller_(NULL),
       canceled_(false),
       parent_menu_item_(NULL),
       type_(SUBMENU),
       selected_(false),
       command_(0),
       submenu_(NULL),
       has_mnemonics_(false),
       show_mnemonics_(false),
+      is_root_context_menu_(false),
       has_icons_(false),
       icon_view_(NULL),
       top_margin_(-1),
       bottom_margin_(-1),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_),
       use_right_margin_(true) {
   // NOTE: don't check the delegate for NULL, UpdateMenuPartSizes supplies a
   // NULL delegate.
   Init(NULL, 0, SUBMENU, delegate);
@@ skipping 515 matching lines @@
   set_id(kMenuItemViewID);
   has_icons_ = false;
 
   // Don't request enabled status from the root menu item as it is just
   // a container for real items.  EMPTY items will be disabled.
   MenuDelegate* root_delegate = GetDelegate();
   if (parent && type != EMPTY && root_delegate)
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
-void MenuItemView::PrepareForRun(bool has_mnemonics, bool show_mnemonics) {
+void MenuItemView::PrepareForRun(bool has_mnemonics, bool show_mnemonics,
+                                 bool is_root_context_menu) {
   // Currently we only support showing the root.
   DCHECK(!parent_menu_item_);
 
   // Force us to have a submenu.
   CreateSubmenu();
   actual_menu_position_ = requested_menu_position_;
   canceled_ = false;
 
   has_mnemonics_ = has_mnemonics;
   show_mnemonics_ = has_mnemonics && show_mnemonics;
+  is_root_context_menu_ = is_root_context_menu;
 
   AddEmptyMenus();
 
   if (!MenuController::GetActiveInstance()) {
     // Only update the menu size if there are no menus showing, otherwise
     // things may shift around.
     UpdateMenuPartSizes();
   }
 }
 
@@ skipping 198 matching lines @@
       temp_width = menu_item->GetMaxIconViewWidth();
     } else if (menu_item->icon_view()) {
       temp_width = menu_item->icon_view()->GetPreferredSize().width();
     }
     width = std::max(width, temp_width);
   }
   return width;
 }
 
 }  // namespace views