Centered flood fill style ink drop ripples on mouse/touch points.

ash/shelf/shelf_button.cc

 // Copyright 2013 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_button.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/common/ash_constants.h"
@@ skipping 327 matching lines @@
     Layout();
     if (state & STATE_ATTENTION)
       bar_->ShowAttention(false);
   }
 }
 
 gfx::Rect ShelfButton::GetIconBounds() const {
   return icon_view_->bounds();
 }
 
-void ShelfButton::OnDragStarted() {
-  AnimateInkDrop(views::InkDropState::HIDDEN);
+void ShelfButton::OnDragStarted(const ui::LocatedEvent* event) {
+  AnimateInkDrop(views::InkDropState::HIDDEN, event);
 }
 
 void ShelfButton::ShowContextMenu(const gfx::Point& p,
                                   ui::MenuSourceType source_type) {
   if (!context_menu_controller())
     return;
 
   bool destroyed = false;
   destroyed_flag_ = &destroyed;
 
@@ skipping 136 matching lines @@
     default:
       return CustomButton::OnGestureEvent(event);
   }
 }
 
 std::unique_ptr<views::InkDropRipple> ShelfButton::CreateInkDropRipple() const {
   return base::WrapUnique(new views::SquareInkDropRipple(
       gfx::Size(kInkDropLargeSize, kInkDropLargeSize),
       kInkDropLargeCornerRadius,
       gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
-      kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
+      kInkDropSmallCornerRadius, GetLocalBounds().CenterPoint(),
+      GetInkDropBaseColor()));
 }
 
 bool ShelfButton::ShouldEnterPushedState(const ui::Event& event) {
   if (!shelf_view_->ShouldEventActivateButton(this, event))
     return false;
 
   return CustomButton::ShouldEnterPushedState(event);
 }
 
 bool ShelfButton::ShouldShowInkDropHighlight() const {
@@ skipping 55 matching lines @@
         views::ImageView::TRAILING));
     bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(
         views::ImageView::TRAILING, views::ImageView::CENTER,
         views::ImageView::CENTER));
     bar_->SchedulePaint();
   }
   bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);
 }
 
 }  // namespace ash