| OLD | NEW |
|---|
| 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 "ash/test/material_design_controller_test_api.h" | 5 #include "ash/common/test/material_design_controller_test_api.h" |
| 6 | 6 |
| 7 namespace ash { | 7 namespace ash { |
| 8 namespace test { | 8 namespace test { |
| 9 | 9 |
| 10 MaterialDesignControllerTestAPI::MaterialDesignControllerTestAPI( | 10 MaterialDesignControllerTestAPI::MaterialDesignControllerTestAPI( |
| 11 MaterialDesignController::Mode mode) | 11 MaterialDesignController::Mode mode) |
| 12 : previous_mode_(MaterialDesignController::mode()) { | 12 : previous_mode_(MaterialDesignController::mode()) { |
| 13 MaterialDesignController::SetMode(mode); | 13 MaterialDesignController::SetMode(mode); |
| 14 } | 14 } |
| 15 | 15 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 37 return MaterialDesignController::DefaultMode(); | 37 return MaterialDesignController::DefaultMode(); |
| 38 } | 38 } |
| 39 | 39 |
| 40 // static | 40 // static |
| 41 void MaterialDesignControllerTestAPI::Uninitialize() { | 41 void MaterialDesignControllerTestAPI::Uninitialize() { |
| 42 MaterialDesignController::Uninitialize(); | 42 MaterialDesignController::Uninitialize(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 } // namespace test | 45 } // namespace test |
| 46 } // namespace ash | 46 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2053113002:
Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master