Add ink drop masking to TrayBackgroundView

ash/shelf/shelf_view_unittest.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 "ash/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 1968 matching lines @@
       : ink_drop_(std::move(ink_drop)) {}
   ~InkDropSpy() override {}
 
   std::vector<views::InkDropState> GetAndResetRequestedStates() {
     std::vector<views::InkDropState> requested_states;
     requested_states.swap(requested_states_);
     return requested_states;
   }
 
   // views::InkDrop:
+  void HostSizeChanged(const gfx::Size& new_size) override {
+    ink_drop_->HostSizeChanged(new_size);
+  }
   views::InkDropState GetTargetInkDropState() const override {
     return ink_drop_->GetTargetInkDropState();
   }
   void AnimateToState(views::InkDropState ink_drop_state) override {
     requested_states_.push_back(ink_drop_state);
     ink_drop_->AnimateToState(ink_drop_state);
   }
   void SnapToActivated() override { ink_drop_->SnapToActivated(); }
   void SetHovered(bool is_hovered) override {
     ink_drop_->SetHovered(is_hovered);
@@ skipping 134 matching lines @@
   // before calling base class's SetUp(). Shell will take ownership of the
   // returned object.
   virtual TestShellDelegate* CreateTestShellDelegate() {
     shell_delegate_ = new TestAppListShellDelegate;
     return shell_delegate_;
   }
 
   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);
   }
 
   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));
   }
 
   void ShowAppList() {
     DCHECK(shelf_delegate_);
     shell_delegate_->app_list_presenter()->Show(0);
     // Similar to real AppListPresenter, notify button that the app list is
     // shown.
@@ skipping 480 matching lines @@
 class OverflowButtonInkDropTest : public ShelfViewInkDropTest {
  public:
   OverflowButtonInkDropTest() {}
   ~OverflowButtonInkDropTest() override {}
 
   void SetUp() override {
     ShelfViewInkDropTest::SetUp();
 
     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));
 
     AddButtonsUntilOverflow();
     EXPECT_TRUE(test_api_->IsOverflowButtonVisible());
     EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
   }
 
  protected:
@@ skipping 498 matching lines @@
                 IsEmpty());
 
     ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
   }
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace test
 }  // namespace ash