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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/shelf/shelf_model_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager.h » ('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/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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/macros.h" 12 #include "base/macros.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 ShelfNavigatorTest : public testing::Test { 19 class ShelfNavigatorTest : public testing::Test {
20 public: 20 public:
21 ShelfNavigatorTest() {} 21 ShelfNavigatorTest() {}
22 22
23 protected: 23 protected:
24 virtual void SetUp() OVERRIDE { 24 virtual void SetUp() override {
25 model_.reset(new ShelfModel); 25 model_.reset(new ShelfModel);
26 26
27 // Add APP_LIST for test. 27 // Add APP_LIST for test.
28 ShelfItem app_list; 28 ShelfItem app_list;
29 app_list.type = TYPE_APP_LIST; 29 app_list.type = TYPE_APP_LIST;
30 model_->Add(app_list); 30 model_->Add(app_list);
31 31
32 // Initially, applist launcher item is only created. 32 // Initially, applist launcher item is only created.
33 int total_num = model_->item_count(); 33 int total_num = model_->item_count();
34 EXPECT_EQ(1, total_num); 34 EXPECT_EQ(1, total_num);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ash/shelf/shelf_model_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698