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

Side by Side Diff: ash/test/ash_md_test_base.h

Issue 2203003003: Get AcceleratorControllerTest working with mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 4 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/mus/test/wm_test_helper.cc ('k') | ash/test/ash_test_helper.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef ASH_TEST_ASH_MD_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_MD_TEST_BASE_H_
6 #define ASH_TEST_ASH_MD_TEST_BASE_H_ 6 #define ASH_TEST_ASH_MD_TEST_BASE_H_
7 7
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/test/material_design_controller_test_api.h"
9 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
10 11
11 namespace ash { 12 namespace ash {
12 namespace test { 13 namespace test {
13 class MaterialDesignControllerTestAPI; 14 class MaterialDesignControllerTestAPI;
14 15
15 class AshMDTestBase 16 class AshMDTestBase
16 : public AshTestBase, 17 : public AshTestBase,
17 public testing::WithParamInterface<ash::MaterialDesignController::Mode> { 18 public testing::WithParamInterface<ash::MaterialDesignController::Mode> {
18 public: 19 public:
(...skipping 15 matching lines...) Expand all
34 // to adjust the display/root window size. 35 // to adjust the display/root window size.
35 int md_auto_hidden_shelf_height_offset_ = 0; 36 int md_auto_hidden_shelf_height_offset_ = 0;
36 37
37 DISALLOW_COPY_AND_ASSIGN(AshMDTestBase); 38 DISALLOW_COPY_AND_ASSIGN(AshMDTestBase);
38 }; 39 };
39 40
40 } // namespace test 41 } // namespace test
41 } // namespace ash 42 } // namespace ash
42 43
43 #endif // ASH_TEST_ASH_MD_TEST_BASE_H_ 44 #endif // ASH_TEST_ASH_MD_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/mus/test/wm_test_helper.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698