Mouse hover out of context menu should un-select menu item....

chrome/views/controls/menu/chrome_menu.cc

 // Copyright (c) 2006-2008 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 "chrome/views/controls/menu/chrome_menu.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
@@ skipping 635 matching lines @@
 
 // MenuHost is the window responsible for showing a single menu.
 //
 // Similar to MenuHostRootView, care must be taken such that when MenuHost is
 // deleted, it doesn't delete the menu items. MenuHost is closed via a
 // DelayedClosed, which avoids timing issues with deleting the window while
 // capture or events are directed at it.
 
 class MenuHost : public WidgetWin {
  public:
-  MenuHost(SubmenuView* submenu)
+  explicit MenuHost(SubmenuView* submenu)
       : closed_(false),
         submenu_(submenu),
         owns_capture_(false) {
     set_window_style(WS_POPUP);
     set_initial_class_style(
         (win_util::GetWinVersion() < win_util::WINVERSION_XP) ?
         0 : CS_DROPSHADOW);
     is_mouse_down_ =
         ((GetKeyState(VK_LBUTTON) & 0x80) ||
          (GetKeyState(VK_RBUTTON) & 0x80) ||
@@ skipping 100 matching lines @@
 
 // EmptyMenuMenuItem is used when a menu has no menu items. EmptyMenuMenuItem
 // is itself a MenuItemView, but it uses a different ID so that it isn't
 // identified as a MenuItemView.
 
 class EmptyMenuMenuItem : public MenuItemView {
  public:
   // ID used for EmptyMenuMenuItem.
   static const int kEmptyMenuItemViewID;
 
-  EmptyMenuMenuItem(MenuItemView* parent) : MenuItemView(parent, 0, NORMAL) {
+  explicit EmptyMenuMenuItem(MenuItemView* parent) :
+      MenuItemView(parent, 0, NORMAL) {
     SetTitle(l10n_util::GetString(IDS_MENU_EMPTY_SUBMENU));
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
 };
 
@@ skipping 826 matching lines @@
   POINT initial_loc = { bounds.x(), bounds.y() };
   HMONITOR monitor = MonitorFromPoint(initial_loc, MONITOR_DEFAULTTONEAREST);
   if (monitor) {
     MONITORINFO mi = {0};
     mi.cbSize = sizeof(mi);
     GetMonitorInfo(monitor, &mi);
     // Menus appear over the taskbar.
     pending_state_.monitor_bounds = gfx::Rect(mi.rcMonitor);
   }
 
-  any_menu_contains_mouse_ = false;
-
   // Set the selection, which opens the initial menu.
   SetSelection(root, true, true);
 
   if (!blocking_run_) {
     // Start the timer to hide the menu. This is needed as we get no
     // notification when the drag has finished.
     StartCancelAllTimer();
     return NULL;
   }
 
@@ skipping 134 matching lines @@
     // We're going to close and we own the mouse capture. We need to repost the
     // mouse down, otherwise the window the user clicked on won't get the
     // event.
     RepostEvent(source, event);
 
     // And close.
     Cancel(true);
     return;
   }
 
-  any_menu_contains_mouse_ = true;
-
   bool open_submenu = false;
   if (!part.menu) {
     part.menu = source->GetMenuItem();
     open_submenu = true;
   } else {
     if (part.menu->GetDelegate()->CanDrag(part.menu)) {
       possible_drag_ = true;
       press_x_ = event.x();
       press_y_ = event.y();
     }
@@ skipping 55 matching lines @@
         }  // else case, drop was on us.
       }  // else case, someone canceled us, don't do anything
     }
     return;
   }
   if (part.type == MenuPart::MENU_ITEM) {
     if (!part.menu)
       part.menu = source->GetMenuItem();
     SetSelection(part.menu ? part.menu : state_.item, true, false);
   }
-  any_menu_contains_mouse_ = (part.type == MenuPart::MENU_ITEM);
 }
 
 void MenuController::OnMouseReleased(SubmenuView* source,
                                      const MouseEvent& event) {
 #ifdef DEBUG_MENU
   DLOG(INFO) << "OnMouseReleased source=" << source;
 #endif
   if (!blocking_run_)
     return;
 
   DCHECK(state_.item);
   possible_drag_ = false;
   DCHECK(blocking_run_);
   MenuPart part =
       GetMenuPartByScreenCoordinate(source, event.x(), event.y());
-  any_menu_contains_mouse_ = (part.type == MenuPart::MENU_ITEM);
   if (event.IsRightMouseButton() && (part.type == MenuPart::MENU_ITEM &&
                                      part.menu)) {
     // Set the selection immediately, making sure the submenu is only open
     // if it already was.
     bool open_submenu = (state_.item == pending_state_.item &&
                          state_.submenu_open);
     SetSelection(pending_state_.item, open_submenu, true);
     gfx::Point loc(event.location());
     View::ConvertPointToScreen(source->GetScrollViewContainer(), &loc);
 
@@ skipping 23 matching lines @@
     return;
 
   MenuPart part =
       GetMenuPartByScreenCoordinate(source, event.x(), event.y());
 
   UpdateScrolling(part);
 
   if (!blocking_run_)
     return;
 
-  any_menu_contains_mouse_ = (part.type == MenuPart::MENU_ITEM);
   if (part.type == MenuPart::MENU_ITEM && part.menu) {
     SetSelection(part.menu, true, false);
-  } else if (!part.is_scroll() && any_menu_contains_mouse_ &&
-             pending_state_.item &&
+  } else if (!part.is_scroll() && pending_state_.item &&
              (!pending_state_.item->HasSubmenu() ||
               !pending_state_.item->GetSubmenu()->IsShowing())) {
     // On exit if the user hasn't selected an item with a submenu, move the
     // selection back to the parent menu item.
     SetSelection(pending_state_.item->GetParentMenuItem(), true, false);
-    any_menu_contains_mouse_ = false;
   }
 }
 
 void MenuController::OnMouseEntered(SubmenuView* source,
                                     const MouseEvent& event) {
   // MouseEntered is always followed by a mouse moved, so don't need to
   // do anything here.
 }
 
 bool MenuController::CanDrop(SubmenuView* source, const OSExchangeData& data) {
@@ skipping 264 matching lines @@
 MenuController::MenuController(bool blocking)
     : blocking_run_(blocking),
       showing_(false),
       exit_all_(false),
       did_capture_(false),
       result_(NULL),
       drop_target_(NULL),
       owner_(NULL),
       possible_drag_(false),
       valid_drop_coordinates_(false),
-      any_menu_contains_mouse_(false),
       showing_submenu_(false),
       result_mouse_event_flags_(0) {
 #ifdef DEBUG_MENU
   instance_count++;
   DLOG(INFO) << "created MC, count=" << instance_count;
 #endif
 }
 
 MenuController::~MenuController() {
   DCHECK(!showing_);
@@ skipping 593 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 }  // namespace views