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

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

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds 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/shelf/shelf_widget.cc ('k') | ash/test/ash_md_test_base.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/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/test/material_design_controller_test_api.h"
11 10
12 namespace ash { 11 namespace ash {
13 namespace test { 12 namespace test {
13 class MaterialDesignControllerTestAPI;
14 14
15 class AshMDTestBase 15 class AshMDTestBase
16 : public AshTestBase, 16 : public AshTestBase,
17 public testing::WithParamInterface<ash::MaterialDesignController::Mode> { 17 public testing::WithParamInterface<ash::MaterialDesignController::Mode> {
18 public: 18 public:
19 AshMDTestBase(); 19 AshMDTestBase();
20 ~AshMDTestBase() override; 20 ~AshMDTestBase() override;
21 21
22 // AshTestBase: 22 // AshTestBase:
23 void SetUp() override; 23 void SetUp() override;
(...skipping 13 matching lines...) Expand all
37 // to adjust the display/root window size. 37 // to adjust the display/root window size.
38 int md_auto_hidden_shelf_height_offset_ = 0; 38 int md_auto_hidden_shelf_height_offset_ = 0;
39 39
40 DISALLOW_COPY_AND_ASSIGN(AshMDTestBase); 40 DISALLOW_COPY_AND_ASSIGN(AshMDTestBase);
41 }; 41 };
42 42
43 } // namespace test 43 } // namespace test
44 } // namespace ash 44 } // namespace ash
45 45
46 #endif // ASH_TEST_ASH_MD_TEST_BASE_H_ 46 #endif // ASH_TEST_ASH_MD_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/test/ash_md_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698