Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

chrome/browser/ui/views/download/download_item_view_md.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 "chrome/browser/ui/views/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 40 matching lines @@
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/gfx/vector_icons_public.h"
-#include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 72 matching lines @@
   }
 
  private:
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(SeparatorBorder);
 };
 
 }  // namespace
 
+// Allows the DownloadItemViewMd to control the InkDrop on the drop down button.
+class DownloadItemViewMd::DropDownButton : public BarControlButton {
+ public:
+  explicit DropDownButton(views::ButtonListener* listener)
+      : BarControlButton(listener) {}
+  ~DropDownButton() override {}
+
+  // Promoted visibility to public.
+  void AnimateInkDrop(views::InkDropState state) {
+    BarControlButton::AnimateInkDrop(state);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DropDownButton);
+};
+
 DownloadItemViewMd::DownloadItemViewMd(DownloadItem* download_item,
                                        DownloadShelfView* parent)
     : shelf_(parent),
       status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
       dropdown_state_(NORMAL),
       mode_(NORMAL_MODE),
       dragging_(false),
       starting_drag_(false),
       model_(download_item),
-      button_ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
       save_button_(nullptr),
       discard_button_(nullptr),
-      dropdown_button_(new BarControlButton(this)),
+      dropdown_button_(new DropDownButton(this)),
       dangerous_download_label_(nullptr),
       dangerous_download_label_sized_(false),
       disabled_while_opening_(false),
       creation_time_(base::Time::Now()),
       time_download_warning_shown_(base::Time()),
       weak_ptr_factory_(this) {
-  set_ink_drop_delegate(base::WrapUnique(button_ink_drop_delegate_));
+  SetHasInkDrop(true);
   DCHECK(download());
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
   download()->AddObserver(this);
   set_context_menu_controller(this);
 
   dropdown_button_->SetBorder(
       views::Border::CreateEmptyBorder(gfx::Insets(kDropdownBorderWidth)));
   dropdown_button_->set_ink_drop_size(gfx::Size(32, 32));
   AddChildView(dropdown_button_);
 
@@ skipping 202 matching lines @@
 
 // Handle drag (file copy) operations.
 bool DownloadItemViewMd::OnMouseDragged(const ui::MouseEvent& event) {
   // Mouse should not activate us in dangerous mode.
   if (IsShowingWarningDialog())
     return true;
 
   if (!starting_drag_) {
     starting_drag_ = true;
     drag_start_point_ = event.location();
-    button_ink_drop_delegate_->OnAction(views::InkDropState::HIDDEN);
+    AnimateInkDrop(views::InkDropState::HIDDEN);
   }
   if (dragging_) {
     if (download()->GetState() == DownloadItem::COMPLETE) {
       IconManager* im = g_browser_process->icon_manager();
       gfx::Image* icon = im->LookupIconFromFilepath(
           download()->GetTargetFilePath(), IconLoader::SMALL);
       views::Widget* widget = GetWidget();
       DragDownloadItem(download(), icon,
                        widget ? widget->GetNativeView() : NULL);
     }
@@ skipping 19 matching lines @@
   }
 }
 
 bool DownloadItemViewMd::OnKeyPressed(const ui::KeyEvent& event) {
   // Key press should not activate us in dangerous mode.
   if (IsShowingWarningDialog())
     return true;
 
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
-    button_ink_drop_delegate_->set_last_ink_drop_location(
-        GetLocalBounds().CenterPoint());
     // OpenDownload may delete this, so don't add any code after this line.
     OpenDownload();
     return true;
   }
   return false;
 }
 
 bool DownloadItemViewMd::GetTooltipText(const gfx::Point& p,
                                         base::string16* tooltip) const {
   if (IsShowingWarningDialog()) {
@@ skipping 23 matching lines @@
 void DownloadItemViewMd::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   InkDropHostView::AddInkDropLayer(ink_drop_layer);
   // The layer that's added to host the ink drop layer must mask to bounds
   // so the hover effect is clipped while animating open.
   layer()->SetMasksToBounds(true);
 }
 
 std::unique_ptr<views::InkDropRipple> DownloadItemViewMd::CreateInkDropRipple()
     const {
   return base::WrapUnique(new views::FloodFillInkDropRipple(
-      GetLocalBounds(), button_ink_drop_delegate_->last_ink_drop_location(),
+      GetLocalBounds(), GetLocalBounds().CenterPoint(),
       color_utils::DeriveDefaultIconColor(GetTextColor())));
 }
 
 std::unique_ptr<views::InkDropHighlight>
 DownloadItemViewMd::CreateInkDropHighlight() const {
   if (IsShowingWarningDialog())
     return nullptr;
 
   gfx::Size size = GetPreferredSize();
   return base::WrapUnique(new views::InkDropHighlight(
@@ skipping 242 matching lines @@
 }
 
 void DownloadItemViewMd::OpenDownload() {
   DCHECK(!IsShowingWarningDialog());
   // We're interested in how long it takes users to open downloads.  If they
   // open downloads super quickly, we should be concerned about clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
 
   UpdateAccessibleName();
-  button_ink_drop_delegate_->OnAction(views::InkDropState::ACTION_TRIGGERED);
+  AnimateInkDrop(views::InkDropState::ACTION_TRIGGERED);
 
   // Calling download()->OpenDownload may delete this, so this must be
   // the last thing we do.
   download()->OpenDownload();
 }
 
 bool DownloadItemViewMd::SubmitDownloadToFeedbackService() {
 #if defined(FULL_SAFE_BROWSING)
   safe_browsing::SafeBrowsingService* sb_service =
       g_browser_process->safe_browsing_service();
@@ skipping 79 matching lines @@
     return;
 
   // Stop any completion animation.
   if (complete_animation_.get() && complete_animation_->is_animating())
     complete_animation_->End();
 
   // Don't show the ripple for right clicks.
   if (!active_event)
     return;
 
-  button_ink_drop_delegate_->set_last_ink_drop_location(event.location());
-  button_ink_drop_delegate_->OnAction(views::InkDropState::ACTION_PENDING);
+  AnimateInkDrop(views::InkDropState::ACTION_PENDING);
 }
 
 void DownloadItemViewMd::HandleClickEvent(const ui::LocatedEvent& event,
                                           bool active_event) {
   // Mouse should not activate us in dangerous mode.
   if (mode_ == DANGEROUS_MODE)
     return;
 
   if (!active_event || IsShowingWarningDialog())
     return;
 
   // OpenDownload may delete this, so don't add any code after this line.
   OpenDownload();
 }
 
 void DownloadItemViewMd::SetDropdownState(State new_state) {
   // Avoid extra SchedulePaint()s if the state is going to be the same and
   // |dropdown_button_| has already been initialized.
   if (dropdown_state_ == new_state &&
       !dropdown_button_->GetImage(views::CustomButton::STATE_NORMAL).isNull())
     return;
 
   dropdown_button_->SetIcon(
       new_state == PUSHED ? gfx::VectorIconId::FIND_NEXT
                           : gfx::VectorIconId::FIND_PREV,
       base::Bind(&DownloadItemViewMd::GetTextColor, base::Unretained(this)));
   if (new_state != dropdown_state_) {
-    dropdown_button_->ink_drop_delegate()->OnAction(
-        new_state == PUSHED ? views::InkDropState::ACTIVATED
-                            : views::InkDropState::DEACTIVATED);
+    dropdown_button_->AnimateInkDrop(new_state == PUSHED
+                                         ? views::InkDropState::ACTIVATED
+                                         : views::InkDropState::DEACTIVATED);
   }
   dropdown_button_->OnThemeChanged();
   dropdown_state_ = new_state;
   SchedulePaint();
 }
 
 void DownloadItemViewMd::ToggleWarningDialog() {
   if (model_.IsDangerous())
     ShowWarningDialog();
   else
@@ skipping 231 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }