Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: chrome/browser/ui/views/download/download_item_view_md.h

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict in custom_button.cc Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/download/download_item_view_md.h
diff --git a/chrome/browser/ui/views/download/download_item_view_md.h b/chrome/browser/ui/views/download/download_item_view_md.h
index 2bb91e8081a3aef0866bb848d97ae5367df0f5fe..89bbefa55a51a9ff333139217e6b95e00e2cb74e 100644
--- a/chrome/browser/ui/views/download/download_item_view_md.h
+++ b/chrome/browser/ui/views/download/download_item_view_md.h
@@ -35,7 +35,6 @@
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
-class BarControlButton;
class DownloadShelfView;
class DownloadShelfContextMenuView;
@@ -132,6 +131,7 @@ class DownloadItemViewMd : public views::InkDropHostView,
private:
enum State { NORMAL = 0, HOT, PUSHED };
+ class DropDownButton;
enum Mode {
NORMAL_MODE = 0, // Showing download item.
@@ -279,12 +279,6 @@ class DownloadItemViewMd : public views::InkDropHostView,
// 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_;
@@ -293,7 +287,7 @@ class DownloadItemViewMd : public views::InkDropHostView,
views::LabelButton* discard_button_;
// The drop down button.
- BarControlButton* dropdown_button_;
+ DropDownButton* dropdown_button_;
// Dangerous mode label.
views::Label* dangerous_download_label_;
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/download/download_item_view_md.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698