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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Rebased and fixed tests Created 3 years, 9 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/common/shelf/shelf_view.h" 5 #include "ash/common/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 1949 matching lines...) Expand 10 before | Expand all | Expand 10 after
1960 ink_drop_->AnimateToState(ink_drop_state); 1960 ink_drop_->AnimateToState(ink_drop_state);
1961 } 1961 }
1962 void SnapToActivated() override { ink_drop_->SnapToActivated(); } 1962 void SnapToActivated() override { ink_drop_->SnapToActivated(); }
1963 void SetHovered(bool is_hovered) override { 1963 void SetHovered(bool is_hovered) override {
1964 ink_drop_->SetHovered(is_hovered); 1964 ink_drop_->SetHovered(is_hovered);
1965 } 1965 }
1966 void SetFocused(bool is_focused) override { 1966 void SetFocused(bool is_focused) override {
1967 ink_drop_->SetFocused(is_focused); 1967 ink_drop_->SetFocused(is_focused);
1968 } 1968 }
1969 1969
1970 bool IsHighlightFadingInOrVisible() const override {
1971 return ink_drop_->IsHighlightFadingInOrVisible();
1972 }
1973
1970 std::unique_ptr<views::InkDrop> ink_drop_; 1974 std::unique_ptr<views::InkDrop> ink_drop_;
1971 std::vector<views::InkDropState> requested_states_; 1975 std::vector<views::InkDropState> requested_states_;
1972 1976
1973 private: 1977 private:
1974 DISALLOW_COPY_AND_ASSIGN(InkDropSpy); 1978 DISALLOW_COPY_AND_ASSIGN(InkDropSpy);
1975 }; 1979 };
1976 1980
1977 // A ShelfItemDelegate that returns a menu for the shelf item. 1981 // A ShelfItemDelegate that returns a menu for the shelf item.
1978 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { 1982 class ListMenuShelfItemDelegate : public TestShelfItemDelegate {
1979 public: 1983 public:
(...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
3012 EXPECT_EQ(views::InkDropState::ACTIVATED, 3016 EXPECT_EQ(views::InkDropState::ACTIVATED,
3013 overflow_button_ink_drop_->GetTargetInkDropState()); 3017 overflow_button_ink_drop_->GetTargetInkDropState());
3014 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3018 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3015 IsEmpty()); 3019 IsEmpty());
3016 3020
3017 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3021 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3018 } 3022 }
3019 3023
3020 } // namespace test 3024 } // namespace test
3021 } // namespace ash 3025 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698