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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Refactored 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 1921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 ink_drop_->AnimateToState(ink_drop_state); 1932 ink_drop_->AnimateToState(ink_drop_state);
1933 } 1933 }
1934 void SnapToActivated() override { ink_drop_->SnapToActivated(); } 1934 void SnapToActivated() override { ink_drop_->SnapToActivated(); }
1935 void SetHovered(bool is_hovered) override { 1935 void SetHovered(bool is_hovered) override {
1936 ink_drop_->SetHovered(is_hovered); 1936 ink_drop_->SetHovered(is_hovered);
1937 } 1937 }
1938 void SetFocused(bool is_focused) override { 1938 void SetFocused(bool is_focused) override {
1939 ink_drop_->SetFocused(is_focused); 1939 ink_drop_->SetFocused(is_focused);
1940 } 1940 }
1941 1941
1942 bool IsHighlightFadingInOrVisible() const override { return false; }
bruthig 2017/03/14 03:49:37 This should return |ink_drop_|->IsHighlightFadingI
spqchan 2017/03/21 18:25:22 Done.
1943
1942 std::unique_ptr<views::InkDrop> ink_drop_; 1944 std::unique_ptr<views::InkDrop> ink_drop_;
1943 std::vector<views::InkDropState> requested_states_; 1945 std::vector<views::InkDropState> requested_states_;
1944 1946
1945 private: 1947 private:
1946 DISALLOW_COPY_AND_ASSIGN(InkDropSpy); 1948 DISALLOW_COPY_AND_ASSIGN(InkDropSpy);
1947 }; 1949 };
1948 1950
1949 // A ShelfItemDelegate that returns a menu for the shelf item. 1951 // A ShelfItemDelegate that returns a menu for the shelf item.
1950 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { 1952 class ListMenuShelfItemDelegate : public TestShelfItemDelegate {
1951 public: 1953 public:
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
2961 EXPECT_EQ(views::InkDropState::ACTIVATED, 2963 EXPECT_EQ(views::InkDropState::ACTIVATED,
2962 overflow_button_ink_drop_->GetTargetInkDropState()); 2964 overflow_button_ink_drop_->GetTargetInkDropState());
2963 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2965 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2964 IsEmpty()); 2966 IsEmpty());
2965 2967
2966 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 2968 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
2967 } 2969 }
2968 2970
2969 } // namespace test 2971 } // namespace test
2970 } // namespace ash 2972 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698