| OLD | NEW |
| 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 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1942 ink_drop_->AnimateToState(ink_drop_state); | 1942 ink_drop_->AnimateToState(ink_drop_state); |
| 1943 } | 1943 } |
| 1944 void SnapToActivated() override { ink_drop_->SnapToActivated(); } | 1944 void SnapToActivated() override { ink_drop_->SnapToActivated(); } |
| 1945 void SetHovered(bool is_hovered) override { | 1945 void SetHovered(bool is_hovered) override { |
| 1946 ink_drop_->SetHovered(is_hovered); | 1946 ink_drop_->SetHovered(is_hovered); |
| 1947 } | 1947 } |
| 1948 void SetFocused(bool is_focused) override { | 1948 void SetFocused(bool is_focused) override { |
| 1949 ink_drop_->SetFocused(is_focused); | 1949 ink_drop_->SetFocused(is_focused); |
| 1950 } | 1950 } |
| 1951 | 1951 |
| 1952 bool IsHighlightFadingInOrVisible() const override { |
| 1953 return ink_drop_->IsHighlightFadingInOrVisible(); |
| 1954 } |
| 1955 |
| 1952 std::unique_ptr<views::InkDrop> ink_drop_; | 1956 std::unique_ptr<views::InkDrop> ink_drop_; |
| 1953 std::vector<views::InkDropState> requested_states_; | 1957 std::vector<views::InkDropState> requested_states_; |
| 1954 | 1958 |
| 1955 private: | 1959 private: |
| 1956 DISALLOW_COPY_AND_ASSIGN(InkDropSpy); | 1960 DISALLOW_COPY_AND_ASSIGN(InkDropSpy); |
| 1957 }; | 1961 }; |
| 1958 | 1962 |
| 1959 // A ShelfItemDelegate that returns a menu for the shelf item. | 1963 // A ShelfItemDelegate that returns a menu for the shelf item. |
| 1960 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { | 1964 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { |
| 1961 public: | 1965 public: |
| (...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2989 EXPECT_EQ(views::InkDropState::ACTIVATED, | 2993 EXPECT_EQ(views::InkDropState::ACTIVATED, |
| 2990 overflow_button_ink_drop_->GetTargetInkDropState()); | 2994 overflow_button_ink_drop_->GetTargetInkDropState()); |
| 2991 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), | 2995 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), |
| 2992 IsEmpty()); | 2996 IsEmpty()); |
| 2993 | 2997 |
| 2994 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); | 2998 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); |
| 2995 } | 2999 } |
| 2996 | 3000 |
| 2997 } // namespace test | 3001 } // namespace test |
| 2998 } // namespace ash | 3002 } // namespace ash |
| OLD | NEW |