| 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 1939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1950 CheckAllItemsAreInBounds(); | 1950 CheckAllItemsAreInBounds(); |
| 1951 // Same for overflow case. | 1951 // Same for overflow case. |
| 1952 while (!test_api_->IsOverflowButtonVisible()) { | 1952 while (!test_api_->IsOverflowButtonVisible()) { |
| 1953 AddAppShortcut(); | 1953 AddAppShortcut(); |
| 1954 } | 1954 } |
| 1955 test_api_->RunMessageLoopUntilAnimationsDone(); | 1955 test_api_->RunMessageLoopUntilAnimationsDone(); |
| 1956 CheckAllItemsAreInBounds(); | 1956 CheckAllItemsAreInBounds(); |
| 1957 } | 1957 } |
| 1958 | 1958 |
| 1959 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool()); | 1959 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool()); |
| 1960 INSTANTIATE_TEST_CASE_P(VisibleBounds, | 1960 |
| 1961 // This test seems to be flaky with material design shelf (see |
| 1962 // https://crbug.com/625671) and even in non-material mode (see |
| 1963 // https://crbug.com/619344 which is fixed using a hack). Disabling for now. |
| 1964 // TODO(mohsen): Hopefully, the fix for https://crbug.com/634128 that fixes |
| 1965 // issues with shelf spacing, will fix this flake, too. Re-enable when that |
| 1966 // issue is fixed. |
| 1967 INSTANTIATE_TEST_CASE_P(DISABLED_VisibleBounds, |
| 1961 ShelfViewVisibleBoundsTest, | 1968 ShelfViewVisibleBoundsTest, |
| 1962 testing::Bool()); | 1969 testing::Bool()); |
| 1963 | 1970 |
| 1964 namespace { | 1971 namespace { |
| 1965 | 1972 |
| 1966 // An InkDrop implementation that wraps another InkDrop instance to keep track | 1973 // An InkDrop implementation that wraps another InkDrop instance to keep track |
| 1967 // of state changes requested on it. Note that this will only track transitions | 1974 // of state changes requested on it. Note that this will only track transitions |
| 1968 // routed through AnimateToState() and not the ones performed directly on the | 1975 // routed through AnimateToState() and not the ones performed directly on the |
| 1969 // ripple inside the contained |ink_drop|. | 1976 // ripple inside the contained |ink_drop|. |
| 1970 class InkDropSpy : public views::InkDrop { | 1977 class InkDropSpy : public views::InkDrop { |
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3159 IsEmpty()); | 3166 IsEmpty()); |
| 3160 | 3167 |
| 3161 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); | 3168 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); |
| 3162 } | 3169 } |
| 3163 } | 3170 } |
| 3164 | 3171 |
| 3165 #endif // !defined(OS_WIN) | 3172 #endif // !defined(OS_WIN) |
| 3166 | 3173 |
| 3167 } // namespace test | 3174 } // namespace test |
| 3168 } // namespace ash | 3175 } // namespace ash |
| OLD | NEW |