| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_navigator.h" | 5 #include "ash/shelf/shelf_navigator.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
| 9 #include "ash/shelf/shelf_item_types.h" | 9 #include "ash/shelf/shelf_item_types.h" |
| 10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 if (focused_item.type == TYPE_PLATFORM_APP) { | 57 if (focused_item.type == TYPE_PLATFORM_APP) { |
| 58 focused_item.status = STATUS_ACTIVE; | 58 focused_item.status = STATUS_ACTIVE; |
| 59 model_->Set(focused_index, focused_item); | 59 model_->Set(focused_index, focused_item); |
| 60 } | 60 } |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 | 63 |
| 64 const ShelfModel& model() { return *model_.get(); } | 64 const ShelfModel& model() { return *model_.get(); } |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 scoped_ptr<ShelfModel> model_; | 67 std::unique_ptr<ShelfModel> model_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(ShelfNavigatorTest); | 69 DISALLOW_COPY_AND_ASSIGN(ShelfNavigatorTest); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace | 72 } // namespace |
| 73 | 73 |
| 74 TEST_F(ShelfNavigatorTest, BasicCycle) { | 74 TEST_F(ShelfNavigatorTest, BasicCycle) { |
| 75 // An app shortcut and three platform apps. | 75 // An app shortcut and three platform apps. |
| 76 ShelfItemType types[] = { | 76 ShelfItemType types[] = { |
| 77 TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, | 77 TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 }; | 121 }; |
| 122 // Special case: no items are 'STATUS_ACTIVE'. | 122 // Special case: no items are 'STATUS_ACTIVE'. |
| 123 SetupMockShelfModel(types, arraysize(types), -1); | 123 SetupMockShelfModel(types, arraysize(types), -1); |
| 124 | 124 |
| 125 // If there are no active status, pick the first running item as a fallback. | 125 // If there are no active status, pick the first running item as a fallback. |
| 126 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD)); | 126 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD)); |
| 127 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD)); | 127 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD)); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace ash | 130 } // namespace ash |
| OLD | NEW |