Make the second click on the app shelf icon close the window-list bubble.

ash/shelf/shelf_view.cc

Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index c1774e56f0daed084efc866b40e8895b05562faa..9368ba11c54a29b9c0213de4b6dadde00e1a0e14 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -389,7 +389,9 @@ ShelfView::ShelfView(ShelfModel* model,
       layout_manager_(manager),
       overflow_mode_(false),
       main_shelf_(NULL),
-      dragged_off_from_overflow_to_shelf_(false) {
+      dragged_off_from_overflow_to_shelf_(false),
+      is_usable_event_(true),
+      last_view_index_(-1) {
   DCHECK(model_);
   bounds_animator_.reset(new views::BoundsAnimator(this));
   bounds_animator_->AddObserver(this);
@@ -1571,6 +1573,10 @@ void ShelfView::PointerPressedOnButton(views::View* view,
   if (view_model_->view_size() <= 1 || !item_delegate->IsDraggable())
     return;  // View is being deleted or not draggable, ignore request.
 
+  if (!IsUsableEvent(event)) {

[Mr4D (OOO till 08-26), 2014/12/05 15:21:47]

No {}'s

[Mr4D (OOO till 08-26), 2014/12/05 15:21:47]

Aha! Nice find! Yes, this is much better then the suggested class override! Good
job!

+    is_usable_event_ = false;
+  }
+
   CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName());
   drag_view_ = static_cast<ShelfButton*>(view);
   drag_origin_ = gfx::Point(event.x(), event.y());
@@ -1663,10 +1669,16 @@ void ShelfView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   if (view_index == -1)
     return;
 
-  // If the previous menu was closed by the same event as this one, we ignore
-  // the call.
-  if (!IsUsableEvent(event))
+  // If the menu was just closed by the same event as this one, we ignore
+  // the call. See crbug.com/343005 for more detail.
+  if (!is_usable_event_ && (view_index == last_view_index_)) {

[Mr4D (OOO till 08-26), 2014/12/05 15:21:47]

The index does not need to be checked since we are in a press/release cycle.
As far as I know it is not possible to press multiple buttons at once via touch.

[xdai1, 2014/12/05 19:01:46]

I think we still need to check the index because only if the second click is on
the same shelf icon (view_index == last_view_index_), it should be ignored. But
if the second click is on a different shelf icon (view_index !=
last_view_index_), we still need to handle it (first close the previous menu,
and then open the current menu).

+    is_usable_event_ = true;
     return;
+  }
+
+  // Reset the |is_usable_event_| to true and record the |view_index|.
+  is_usable_event_ = true;
+  last_view_index_ = view_index;
 
   // Don't activate the item twice on double-click. Otherwise the window starts
   // animating open due to the first click, then immediately minimizes due to
@@ -1884,9 +1896,9 @@ bool ShelfView::IsUsableEvent(const ui::Event& event) {
   base::TimeDelta delta =
       base::TimeDelta(event.time_stamp() - closing_event_time_);
   closing_event_time_ = base::TimeDelta();
-  // TODO(skuhne): This time seems excessive, but it appears that the reposting
-  // takes that long.  Need to come up with a better way of doing this.
-  return (delta.InMilliseconds() < 0 || delta.InMilliseconds() > 130);
+  // If the current (press down) event is a reposted event, the time stamp of
+  // these two events should be the same.
+  return (delta.InMilliseconds() != 0);

[Mr4D (OOO till 08-26), 2014/12/05 15:21:47]

Ahhhh! Much better!

 }
 
 const ShelfItem* ShelfView::ShelfItemForView(const views::View* view) const {