Change to address default selection of menu item

ui/views/controls/menu/menu_controller.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_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/time.h"
@@ skipping 1166 matching lines @@
   // going to get any events.
   did_capture_ = false;
   gfx::Point screen_menu_loc;
   View::ConvertPointToScreen(button, &screen_menu_loc);
   // Subtract 1 from the height to make the popup flush with the button border.
   UpdateInitialLocation(gfx::Rect(screen_menu_loc.x(), screen_menu_loc.y(),
                                   button->width(), button->height() - 1),
                         anchor);
   alt_menu->PrepareForRun(
       has_mnemonics,
-      source->GetMenuItem()->GetRootMenuItem()->show_mnemonics_);
+      source->GetMenuItem()->GetRootMenuItem()->show_mnemonics_,
+      false);
   alt_menu->controller_ = this;
   SetSelection(alt_menu, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
   return true;
 }
 
 bool MenuController::ShowContextMenu(MenuItemView* menu_item,
                                      SubmenuView* source,
                                      const ui::LocatedEvent& event) {
   // Set the selection immediately, making sure the submenu is only open
   // if it already was.
@@ skipping 345 matching lines @@
     pref.set_width(std::min(pref.width(), state_.monitor_bounds.width()));
 
   // Assume we can honor prefer_leading.
   *is_leading = prefer_leading;
 
   int x, y;
 
   if (!item->GetParentMenuItem()) {
     // First item, position relative to initial location.
     x = state_.initial_bounds.x();
+    // Offsets for context menu prevent menu items being selected by
+    // simply opening the menu (bug 142992)
+    if(item->is_root_context_menu())
+      x += 1;
     y = state_.initial_bounds.bottom();
-    if (state_.anchor == MenuItemView::TOPRIGHT)
+    if (state_.anchor == MenuItemView::TOPRIGHT) {
       x = x + state_.initial_bounds.width() - pref.width();
+      if(item->is_root_context_menu())
+        x -= 1;
+    }
 
     if (!state_.monitor_bounds.IsEmpty() &&
         y + pref.height() > state_.monitor_bounds.bottom()) {
       // The menu doesn't fit fully below the button on the screen. The menu
       // position with respect to the bounds will be preserved if it has
       // already been drawn. When the requested positioning is below the bounds
       // it will shrink the menu to make it fit below.
       // If the requested positioning is best fit, it will first try to fit the
       // menu below. If that does not fit it will try to place it above. If
       // that will not fit it will place it at the bottom of the work area and
@@ skipping 96 matching lines @@
     if (state_.monitor_bounds.width() != 0) {
       pref.set_height(std::min(pref.height(), state_.monitor_bounds.height()));
       if (y + pref.height() > state_.monitor_bounds.bottom())
         y = state_.monitor_bounds.bottom() - pref.height();
       if (y < state_.monitor_bounds.y())
         y = state_.monitor_bounds.y();
     }
   }
 
   if (state_.monitor_bounds.width() != 0) {
-    if (x + pref.width() > state_.monitor_bounds.right())
-      x = state_.monitor_bounds.right() - pref.width();
-    if (x < state_.monitor_bounds.x())
-      x = state_.monitor_bounds.x();
+    if (x + pref.width() > state_.monitor_bounds.right()) {
+      if(item->is_root_context_menu())
+        x -= pref.width() + 1;
+      else
+        x = state_.monitor_bounds.right() - pref.width();
+    }
+    if (x < state_.monitor_bounds.x()) {
+      int temp_loc = state_.initial_bounds.x() + 1;
+      if(item->is_root_context_menu() && temp_loc >= state_.monitor_bounds.x()
+          && temp_loc + pref.width() < state_.monitor_bounds.right())
+        x = temp_loc;
+      else
+        x = state_.monitor_bounds.x();
+    }
   }
   return gfx::Rect(x, y, pref.width(), pref.height());
 }
 
 // static
 int MenuController::MenuDepth(MenuItemView* item) {
   return item ? (MenuDepth(item->GetParentMenuItem()) + 1) : 0;
 }
 
 void MenuController::IncrementSelection(int delta) {
@@ skipping 419 matching lines @@
 
 #if defined(USE_AURA)
 void MenuController::OnWindowActivated(aura::Window* active,
                                        aura::Window* old_active) {
   if (!drag_in_progress_)
     Cancel(EXIT_ALL);
 }
 #endif
 
 }  // namespace views