Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

chrome/browser/ui/views/download/download_item_view_md.h

 // Copyright 2015 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.
 //
 // A view that implements one download on the Download shelf.
 // Each DownloadItemViewMd contains an application icon, a text label
 // indicating the download's file name, a text label indicating the
 // download's status (such as the number of bytes downloaded so far)
 // and a button for canceling an in progress download, or opening
 // the completed download.
@@ skipping 17 matching lines @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/icon_manager.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/animation/ink_drop_host_view.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 
-class BarControlButton;
 class DownloadShelfView;
 class DownloadShelfContextMenuView;
 
 namespace extensions {
 class ExperienceSamplingEvent;
 }
 
 namespace gfx {
 class Image;
 class ImageSkia;
@@ skipping 76 matching lines @@
   void AnimationProgressed(const gfx::Animation* animation) override;
 
  protected:
   // Overridden from views::View:
   void OnPaint(gfx::Canvas* canvas) override;
   void OnFocus() override;
   void OnBlur() override;
 
  private:
   enum State { NORMAL = 0, HOT, PUSHED };
+  class DropDownButton;
 
   enum Mode {
     NORMAL_MODE = 0,  // Showing download item.
     DANGEROUS_MODE,   // Displaying the dangerous download warning.
     MALICIOUS_MODE    // Displaying the malicious download warning.
   };
 
   void OpenDownload();
 
   // Submits the downloaded file to the safebrowsing download feedback service.
@@ skipping 127 matching lines @@
 
   // For canceling an in progress icon request.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // A model class to control the status text we display.
   DownloadItemModel model_;
 
   // Animation for download complete.
   std::unique_ptr<gfx::SlideAnimation> complete_animation_;
 
-  // A pointer to the InkDropDelegate owned by the base class InkDropHostView.
-  // This is kept as a ButtonInkDropDelegate pointer to avoid unnecessary casts.
-  // TODO(bruthig): Remove the need to cast and remove the
-  // |button_ink_drop_delegate_| variable.
-  views::ButtonInkDropDelegate* button_ink_drop_delegate_;
-
   // Progress animation
   base::RepeatingTimer progress_timer_;
 
   // Dangerous mode buttons.
   views::LabelButton* save_button_;
   views::LabelButton* discard_button_;
 
   // The drop down button.
-  BarControlButton* dropdown_button_;
+  DropDownButton* dropdown_button_;
 
   // Dangerous mode label.
   views::Label* dangerous_download_label_;
 
   // Whether the dangerous mode label has been sized yet.
   bool dangerous_download_label_sized_;
 
   // Whether we are currently disabled as part of opening the downloaded file.
   bool disabled_while_opening_;
 
@@ skipping 19 matching lines @@
   std::unique_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   base::WeakPtrFactory<DownloadItemViewMd> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemViewMd);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_ITEM_VIEW_MD_H_