Add MD ink drop ripple to app list button

ash/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/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/aura/wm_window_aura.h"
@@ skipping 420 matching lines @@
   overflow_button_->OnShelfAlignmentChanged();
   LayoutToIdealBounds();
   for (int i = 0; i < view_model_->view_size(); ++i) {
     if (i >= first_visible_index_ && i <= last_visible_index_)
       view_model_->view_at(i)->Layout();
   }
   tooltip_.Close();
   if (overflow_bubble_)
     overflow_bubble_->Hide();
   // For crbug.com/587931, because AppListButton layout logic is in OnPaint.
-  views::View* app_list_button = GetAppListButtonView();
+  AppListButton* app_list_button = GetAppListButton();
   if (app_list_button)
     app_list_button->SchedulePaint();
 }
 
 void ShelfView::SchedulePaintForAllButtons() {
   for (int i = 0; i < view_model_->view_size(); ++i) {
     if (i >= first_visible_index_ && i <= last_visible_index_)
       view_model_->view_at(i)->SchedulePaint();
   }
   if (overflow_button_ && overflow_button_->visible())
@@ skipping 53 matching lines @@
 }
 
 bool ShelfView::IsShowingMenu() const {
   return launcher_menu_runner_.get() && launcher_menu_runner_->IsRunning();
 }
 
 bool ShelfView::IsShowingOverflowBubble() const {
   return overflow_bubble_.get() && overflow_bubble_->IsShowing();
 }
 
-views::View* ShelfView::GetAppListButtonView() const {
+AppListButton* ShelfView::GetAppListButton() const {
   for (int i = 0; i < model_->item_count(); ++i) {
-    if (model_->items()[i].type == TYPE_APP_LIST)
-      return view_model_->view_at(i);
+    if (model_->items()[i].type == TYPE_APP_LIST) {
+      views::View* view = view_model_->view_at(i);
+      CHECK_EQ(AppListButton::kViewClassName, view->GetClassName());
+      return static_cast<AppListButton*>(view);
+    }
   }
 
   NOTREACHED() << "Applist button not found";
   return nullptr;
 }
 
 bool ShelfView::ShouldHideTooltip(const gfx::Point& cursor_location) const {
   gfx::Rect tooltip_bounds;
   for (int i = 0; i < child_count(); ++i) {
     const views::View* child = child_at(i);
     if (child != overflow_button_ && ShouldShowTooltipForView(child))
       tooltip_bounds.Union(child->GetMirroredBounds());
   }
   return !tooltip_bounds.Contains(cursor_location);
 }
 
 bool ShelfView::ShouldShowTooltipForView(const views::View* view) const {
-  if (view == GetAppListButtonView() &&
+  if (view == GetAppListButton() &&
       Shell::GetInstance()->GetAppListTargetVisibility()) {
     return false;
   }
   const ShelfItem* item = ShelfItemForView(view);
   if (!item)
     return false;
   return item_manager_->GetShelfItemDelegate(item->id)->ShouldShowTooltip();
 }
 
 base::string16 ShelfView::GetTitleForView(const views::View* view) const {
@@ skipping 1190 matching lines @@
     }
 
     ShelfItemDelegate::PerformedAction performed_action =
         item_manager_
             ->GetShelfItemDelegate(model_->items()[last_pressed_index_].id)
             ->ItemSelected(event);
 
     shelf_button_pressed_metric_tracker_.ButtonPressed(event, sender,
                                                        performed_action);
 
+    // For the app list menu no TRIGGERED ink drop effect is needed and it
+    // handles its own ACTIVATED/DEACTIVATED states.
     if (performed_action == ShelfItemDelegate::kNewWindowCreated ||
-        !ShowListMenuForView(model_->items()[last_pressed_index_], sender,
-                             event, ink_drop)) {
+        (performed_action != ShelfItemDelegate::kAppListMenuShown &&
+         !ShowListMenuForView(model_->items()[last_pressed_index_], sender,
+                              event, ink_drop))) {
       ink_drop->AnimateToState(views::InkDropState::ACTION_TRIGGERED);
     }
   }
 }
 
 bool ShelfView::ShowListMenuForView(const ShelfItem& item,
                                     views::View* source,
                                     const ui::Event& event,
                                     views::InkDrop* ink_drop) {
   ShelfItemDelegate* item_delegate =
@@ skipping 141 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash