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

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

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager_unittest.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/shelf/shelf_navigator.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/launcher/launcher.h"
9 #include "ash/launcher/launcher_types.h" 8 #include "ash/launcher/launcher_types.h"
9 #include "ash/shelf/shelf.h"
10 #include "ash/shelf/shelf_model.h" 10 #include "ash/shelf/shelf_model.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 namespace { 17 namespace {
18 18
19 class LauncherNavigatorTest : public testing::Test { 19 class LauncherNavigatorTest : public testing::Test {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 }; 186 };
187 // Special case: no items are 'STATUS_ACTIVE'. 187 // Special case: no items are 'STATUS_ACTIVE'.
188 SetupMockShelfModel(types, arraysize(types), -1); 188 SetupMockShelfModel(types, arraysize(types), -1);
189 189
190 // If there are no active status, pick the first running item as a fallback. 190 // If there are no active status, pick the first running item as a fallback.
191 EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD)); 191 EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
192 EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD)); 192 EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
193 } 193 }
194 194
195 } // namespace ash 195 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698