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

Side by Side Diff: ash/shelf/shelf_view_unittest.cc

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Removed the mask Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_view.h" 5 #include "ash/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after
1986 ink_drop_->AnimateToState(ink_drop_state); 1986 ink_drop_->AnimateToState(ink_drop_state);
1987 } 1987 }
1988 void SnapToActivated() override { ink_drop_->SnapToActivated(); } 1988 void SnapToActivated() override { ink_drop_->SnapToActivated(); }
1989 void SetHovered(bool is_hovered) override { 1989 void SetHovered(bool is_hovered) override {
1990 ink_drop_->SetHovered(is_hovered); 1990 ink_drop_->SetHovered(is_hovered);
1991 } 1991 }
1992 void SetFocused(bool is_focused) override { 1992 void SetFocused(bool is_focused) override {
1993 ink_drop_->SetFocused(is_focused); 1993 ink_drop_->SetFocused(is_focused);
1994 } 1994 }
1995 1995
1996 bool IsHighlightFadingInOrVisible() const override {
1997 return ink_drop_->IsHighlightFadingInOrVisible();
1998 }
1999
1996 std::unique_ptr<views::InkDrop> ink_drop_; 2000 std::unique_ptr<views::InkDrop> ink_drop_;
1997 std::vector<views::InkDropState> requested_states_; 2001 std::vector<views::InkDropState> requested_states_;
1998 2002
1999 private: 2003 private:
2000 DISALLOW_COPY_AND_ASSIGN(InkDropSpy); 2004 DISALLOW_COPY_AND_ASSIGN(InkDropSpy);
2001 }; 2005 };
2002 2006
2003 // A ShelfItemDelegate that returns a menu for the shelf item. 2007 // A ShelfItemDelegate that returns a menu for the shelf item.
2004 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { 2008 class ListMenuShelfItemDelegate : public TestShelfItemDelegate {
2005 public: 2009 public:
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
3120 EXPECT_EQ(views::InkDropState::ACTIVATED, 3124 EXPECT_EQ(views::InkDropState::ACTIVATED,
3121 overflow_button_ink_drop_->GetTargetInkDropState()); 3125 overflow_button_ink_drop_->GetTargetInkDropState());
3122 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3126 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3123 IsEmpty()); 3127 IsEmpty());
3124 3128
3125 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3129 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3126 } 3130 }
3127 3131
3128 } // namespace test 3132 } // namespace test
3129 } // namespace ash 3133 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698