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

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2499523003: Add ink drop masking to TrayBackgroundView (Closed)
Patch Set: Addressed review comments Created 4 years, 1 month 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: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 99a690206c9179e132d00bd7669ed0c9a806c527..0bc25fdfb3fb50e3c6b5314e6f818fb14cec96ff 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -1986,6 +1986,9 @@ class InkDropSpy : public views::InkDrop {
}
// views::InkDrop:
+ void HostSizeChanged(const gfx::Size& new_size) override {
+ ink_drop_->HostSizeChanged(new_size);
+ }
views::InkDropState GetTargetInkDropState() const override {
return ink_drop_->GetTargetInkDropState();
}
@@ -2140,8 +2143,9 @@ class ShelfViewInkDropTest : public ShelfViewTest {
void InitAppListButtonInkDrop() {
app_list_button_ = shelf_view_->GetAppListButton();
- auto app_list_button_ink_drop = base::MakeUnique<InkDropSpy>(
- base::MakeUnique<views::InkDropImpl>(app_list_button_));
+ auto app_list_button_ink_drop =
+ base::MakeUnique<InkDropSpy>(base::MakeUnique<views::InkDropImpl>(
+ app_list_button_, app_list_button_->size()));
app_list_button_ink_drop_ = app_list_button_ink_drop.get();
views::test::InkDropHostViewTestApi(app_list_button_)
.SetInkDrop(std::move(app_list_button_ink_drop), false);
@@ -2150,8 +2154,9 @@ class ShelfViewInkDropTest : public ShelfViewTest {
void InitBrowserButtonInkDrop() {
browser_button_ = test_api_->GetButton(browser_index_);
- auto browser_button_ink_drop = base::MakeUnique<InkDropSpy>(
- base::MakeUnique<views::InkDropImpl>(browser_button_));
+ auto browser_button_ink_drop =
+ base::MakeUnique<InkDropSpy>(base::MakeUnique<views::InkDropImpl>(
+ browser_button_, browser_button_->size()));
browser_button_ink_drop_ = browser_button_ink_drop.get();
views::test::InkDropHostViewTestApi(browser_button_)
.SetInkDrop(std::move(browser_button_ink_drop));
@@ -2652,8 +2657,9 @@ class OverflowButtonInkDropTest : public ShelfViewInkDropTest {
overflow_button_ = test_api_->overflow_button();
- auto overflow_button_ink_drop = base::MakeUnique<InkDropSpy>(
- base::MakeUnique<views::InkDropImpl>(overflow_button_));
+ auto overflow_button_ink_drop =
+ base::MakeUnique<InkDropSpy>(base::MakeUnique<views::InkDropImpl>(
+ overflow_button_, overflow_button_->size()));
overflow_button_ink_drop_ = overflow_button_ink_drop.get();
views::test::InkDropHostViewTestApi(overflow_button_)
.SetInkDrop(std::move(overflow_button_ink_drop));

Powered by Google App Engine
This is Rietveld 408576698