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

Unified Diff: chrome/browser/ui/views/download/download_item_view.cc

Issue 2913643002: Animate ink drop to HIDDEN when showing the context menu. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/download/download_item_view.cc
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index bbd9a696aa2e0f8e97caca7fee839eced5986b9d..70778160200b42fdc43e0cb8d43e92812cf7260a 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -173,7 +173,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download_item,
creation_time_(base::Time::Now()),
time_download_warning_shown_(base::Time()),
weak_ptr_factory_(this) {
- SetInkDropMode(InkDropMode::ON);
+ SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
DCHECK(download());
download()->AddObserver(this);
set_context_menu_controller(this);
@@ -837,6 +837,8 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
static_cast<views::internal::RootView*>(GetWidget()->GetRootView())
->SetMouseHandler(nullptr);
+ AnimateInkDrop(views::InkDropState::HIDDEN, nullptr);
+
if (!context_menu_.get())
context_menu_.reset(new DownloadShelfContextMenuView(this));
context_menu_->Run(GetWidget()->GetTopLevelWidget(), rect, source_type,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698