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

Side by Side Diff: ash/common/shelf/shelf_navigator_unittest.cc

Issue 2169653002: mash: Move shelf_navigator.* to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 5 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
« no previous file with comments | « ash/common/shelf/shelf_navigator.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/shelf/shelf_navigator.h"
6 6
7 #include "ash/common/ash_switches.h"
8 #include "ash/common/shelf/shelf_item_types.h" 7 #include "ash/common/shelf/shelf_item_types.h"
9 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
10 #include "ash/shelf/shelf.h"
11 #include "base/command_line.h"
12 #include "base/macros.h" 9 #include "base/macros.h"
13 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
14 11
15 namespace ash { 12 namespace ash {
16 13
17 namespace { 14 namespace {
18 15
19 class ShelfNavigatorTest : public testing::Test { 16 class ShelfNavigatorTest : public testing::Test {
20 public: 17 public:
21 ShelfNavigatorTest() {} 18 ShelfNavigatorTest() {}
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 }; 120 };
124 // Special case: no items are 'STATUS_ACTIVE'. 121 // Special case: no items are 'STATUS_ACTIVE'.
125 SetupMockShelfModel(types, arraysize(types), -1); 122 SetupMockShelfModel(types, arraysize(types), -1);
126 123
127 // If there are no active status, pick the first running item as a fallback. 124 // If there are no active status, pick the first running item as a fallback.
128 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD)); 125 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
129 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD)); 126 EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
130 } 127 }
131 128
132 } // namespace ash 129 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_navigator.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698