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

Side by Side Diff: ash/common/material_design/material_design_controller_unittest.cc

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/aura/wm_shelf_aura.cc ('k') | ash/common/shelf/app_list_button.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 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 #include <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/test/material_design_controller_test_api.h"
10 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
11 #include "ash/test/material_design_controller_test_api.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace { 17 namespace {
18 18
19 // Test fixture for the MaterialDesignController class. 19 // Test fixture for the MaterialDesignController class.
20 class MaterialDesignControllerTest : public ash::test::AshTestBase { 20 class MaterialDesignControllerTest : public ash::test::AshTestBase {
21 public: 21 public:
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // Verify an invalid command line value uses the default mode. 126 // Verify an invalid command line value uses the default mode.
127 TEST_F(MaterialDesignControllerTestInvalid, CommandLineValue) { 127 TEST_F(MaterialDesignControllerTestInvalid, CommandLineValue) {
128 EXPECT_EQ(test::MaterialDesignControllerTestAPI::DefaultMode() == 128 EXPECT_EQ(test::MaterialDesignControllerTestAPI::DefaultMode() ==
129 MaterialDesignController::Mode::MATERIAL_NORMAL || 129 MaterialDesignController::Mode::MATERIAL_NORMAL ||
130 test::MaterialDesignControllerTestAPI::DefaultMode() == 130 test::MaterialDesignControllerTestAPI::DefaultMode() ==
131 MaterialDesignController::Mode::MATERIAL_EXPERIMENTAL, 131 MaterialDesignController::Mode::MATERIAL_EXPERIMENTAL,
132 test::MaterialDesignControllerTestAPI::IsMaterial()); 132 test::MaterialDesignControllerTestAPI::IsMaterial());
133 } 133 }
134 134
135 } // namespace ash 135 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shelf_aura.cc ('k') | ash/common/shelf/app_list_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698