| 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/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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 | 248 |
| 249 // ShelfDelegate overrides: | 249 // ShelfDelegate overrides: |
| 250 void OnShelfCreated(Shelf* shelf) override {} | 250 void OnShelfCreated(Shelf* shelf) override {} |
| 251 | 251 |
| 252 void OnShelfDestroyed(Shelf* shelf) override {} | 252 void OnShelfDestroyed(Shelf* shelf) override {} |
| 253 | 253 |
| 254 void OnShelfAlignmentChanged(Shelf* shelf) override {} | 254 void OnShelfAlignmentChanged(Shelf* shelf) override {} |
| 255 | 255 |
| 256 void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {} | 256 void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {} |
| 257 | 257 |
| 258 void OnShelfAutoHideStateChanged(Shelf* shelf) override {} |
| 259 |
| 260 void OnShelfVisibilityStateChanged(Shelf* shelf) override {} |
| 261 |
| 258 ShelfID GetShelfIDForAppID(const std::string& app_id) override { | 262 ShelfID GetShelfIDForAppID(const std::string& app_id) override { |
| 259 ShelfID id = 0; | 263 ShelfID id = 0; |
| 260 EXPECT_TRUE(base::StringToInt(app_id, &id)); | 264 EXPECT_TRUE(base::StringToInt(app_id, &id)); |
| 261 return id; | 265 return id; |
| 262 } | 266 } |
| 263 | 267 |
| 264 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; } | 268 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; } |
| 265 | 269 |
| 266 const std::string& GetAppIDForShelfID(ShelfID id) override { | 270 const std::string& GetAppIDForShelfID(ShelfID id) override { |
| 267 // Use |app_id_| member variable because returning a reference to local | 271 // Use |app_id_| member variable because returning a reference to local |
| (...skipping 1717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1985 test_api_->RunMessageLoopUntilAnimationsDone(); | 1989 test_api_->RunMessageLoopUntilAnimationsDone(); |
| 1986 CheckAllItemsAreInBounds(); | 1990 CheckAllItemsAreInBounds(); |
| 1987 } | 1991 } |
| 1988 | 1992 |
| 1989 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool()); | 1993 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool()); |
| 1990 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest, | 1994 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest, |
| 1991 testing::Bool()); | 1995 testing::Bool()); |
| 1992 | 1996 |
| 1993 } // namespace test | 1997 } // namespace test |
| 1994 } // namespace ash | 1998 } // namespace ash |
| OLD | NEW |