views: Cancel menu selection on tap-cancel.

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 515 matching lines @@
           part.menu, *event)) {
         Accept(part.menu, 0);
       }
       event->StopPropagation();
     } else if (part.type == MenuPart::MENU_ITEM) {
       // User either tapped on empty space, or a menu that has children.
       SetSelection(part.menu ? part.menu : state_.item,
                    SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
       event->StopPropagation();
     }
+  } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL &&
+             pending_state_.item &&

[sky, 2013/01/08 04:47:03]

Why the check for pending_state_.item here?

[sadrul, 2013/01/08 08:10:26]

Hm. You are right. It looks like it's not necessary to check for
pending_state_.item here.

+             part.type == MenuPart::MENU_ITEM) {
+    // Move the selection to the parent menu so that the selection in the
+    // current menu is unset. Make sure the submenu remains open by sending the
+    // appropriate SetSelectionTypes flags.
+    SetSelection(part.menu->GetParentMenuItem(),

[sky, 2013/01/08 04:47:03]

parn->menu can be NULL even if type == MENU_ITEM.

[sadrul, 2013/01/08 08:10:26]

Ah, I see. I have added a check for non-null part.menu before we get here.

+        SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
+    event->StopPropagation();
   }
+
   if (event->stopped_propagation())
       return;
 
   if (!part.submenu)
     return;
   part.submenu->OnGestureEvent(event);
 }
 
 bool MenuController::GetDropFormats(
       SubmenuView* source,
@@ skipping 189 matching lines @@
     current_path[i]->SetSelected(false);
   }
 
   // Notify the new path it is selected.
   for (size_t i = paths_differ_at; i < new_size; ++i)
     new_path[i]->SetSelected(true);
 
   if (menu_item && menu_item->GetDelegate())
     menu_item->GetDelegate()->SelectionChanged(menu_item);
 
-  // TODO(sky): convert back to DCHECK when figure out 93471.

[sadrul, 2013/01/02 20:08:36]

The bug is now fixed.

-  CHECK(menu_item || (selection_types & SELECTION_EXIT) != 0);
+  DCHECK(menu_item || (selection_types & SELECTION_EXIT) != 0);
 
   pending_state_.item = menu_item;
   pending_state_.submenu_open = (selection_types & SELECTION_OPEN_SUBMENU) != 0;
 
   // Stop timers.
   StopCancelAllTimer();
   // Resets show timer only when pending menu item is changed.
   if (pending_item_changed)
     StopShowTimer();
 
@@ skipping 767 matching lines @@
 
 void MenuController::BuildMenuItemPath(MenuItemView* item,
                                        std::vector<MenuItemView*>* path) {
   if (!item)
     return;
   BuildMenuItemPath(item->GetParentMenuItem(), path);
   path->push_back(item);
 }
 
 void MenuController::StartShowTimer() {
-    show_timer_.Start(FROM_HERE,
-                      TimeDelta::FromMilliseconds(menu_config_.show_delay),
-                      this, &MenuController::CommitPendingSelection);
+  show_timer_.Start(FROM_HERE,
+                    TimeDelta::FromMilliseconds(menu_config_.show_delay),
+                    this, &MenuController::CommitPendingSelection);
 }
 
 void MenuController::StopShowTimer() {
   show_timer_.Stop();
 }
 
 void MenuController::StartCancelAllTimer() {
   cancel_all_timer_.Start(FROM_HERE,
                           TimeDelta::FromMilliseconds(kCloseOnExitTime),
                           this, &MenuController::CancelAll);
@@ skipping 588 matching lines @@
              (!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(),
                  SELECTION_OPEN_SUBMENU);
   }
 }
 
 }  // namespace views