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

Side by Side Diff: ash/wm/app_list_controller_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/wm/app_list_controller.h ('k') | ash/wm/ash_focus_rules.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/shell.h" 5 #include "ash/shell.h"
6 #include "ash/shell_window_ids.h" 6 #include "ash/shell_window_ids.h"
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/test/test_shell_delegate.h" 8 #include "ash/test/test_shell_delegate.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 12 matching lines...) Expand all
23 23
24 } 24 }
25 25
26 // The parameter is true to test the centered app list, false for normal. 26 // The parameter is true to test the centered app list, false for normal.
27 // (The test name ends in "/0" for normal, "/1" for centered.) 27 // (The test name ends in "/0" for normal, "/1" for centered.)
28 class AppListControllerTest : public test::AshTestBase, 28 class AppListControllerTest : public test::AshTestBase,
29 public ::testing::WithParamInterface<bool> { 29 public ::testing::WithParamInterface<bool> {
30 public: 30 public:
31 AppListControllerTest(); 31 AppListControllerTest();
32 virtual ~AppListControllerTest(); 32 virtual ~AppListControllerTest();
33 virtual void SetUp() OVERRIDE; 33 virtual void SetUp() override;
34 34
35 bool IsCentered() const; 35 bool IsCentered() const;
36 }; 36 };
37 37
38 AppListControllerTest::AppListControllerTest() { 38 AppListControllerTest::AppListControllerTest() {
39 } 39 }
40 40
41 AppListControllerTest::~AppListControllerTest() { 41 AppListControllerTest::~AppListControllerTest() {
42 } 42 }
43 43
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 int app_list_view_top = 178 int app_list_view_top =
179 app_list->anchor_rect().y() - app_list->bounds().height() / 2; 179 app_list->anchor_rect().y() - app_list->bounds().height() / 2;
180 EXPECT_GE(app_list_view_top, kMinimalCenteredAppListMargin); 180 EXPECT_GE(app_list_view_top, kMinimalCenteredAppListMargin);
181 } 181 }
182 182
183 INSTANTIATE_TEST_CASE_P(AppListControllerTestInstance, 183 INSTANTIATE_TEST_CASE_P(AppListControllerTestInstance,
184 AppListControllerTest, 184 AppListControllerTest,
185 ::testing::Bool()); 185 ::testing::Bool());
186 186
187 } // namespace ash 187 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/app_list_controller.h ('k') | ash/wm/ash_focus_rules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698