Shelf: Hide overflow bubble when app launched from overflow.

ash/common/shelf/shelf_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 "ash/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/ash_constants.h"
@@ skipping 420 matching lines @@
     shelf_button_pressed_metric_tracker_.ButtonPressed(event, sender,
                                                        SHELF_ACTION_NONE);
     return;
   }
 
   // None of the checks in ShouldEventActivateButton() affects overflow button.
   // So, it is safe to be checked after handling overflow button.
   if (!ShouldEventActivateButton(sender, event))
     return;
 
+  // If this is the overflow shelf, |main_shelf_| will not be null. When an item
+  // is pressed on the overflow shelf, we want to hide the overflow bubble,
+  // which is associated with the main shelf. Button presses on the main shelf
+  // cause the overflow bubble to close itself via PointerWatcher functionality.
+  if (main_shelf_ && main_shelf_->IsShowingOverflowBubble())
+    main_shelf_->ToggleOverflowBubble();
+
   // Record the index for the last pressed shelf item.
   last_pressed_index_ = view_model_->GetIndexOfView(sender);
   DCHECK_LT(-1, last_pressed_index_);
 
   // Place new windows on the same display as the button.
   WmWindow* window = WmWindow::Get(sender->GetWidget()->GetNativeWindow());
   scoped_root_window_for_new_windows_.reset(
       new ScopedRootWindowForNewWindows(window->GetRootWindow()));
 
   // Slow down activation animations if shift key is pressed.
@@ skipping 1306 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = wm_shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash