| Index: ash/test/material_design_controller_test_api.cc
|
| diff --git a/ui/base/test/material_design_controller_test_api.cc b/ash/test/material_design_controller_test_api.cc
|
| similarity index 70%
|
| copy from ui/base/test/material_design_controller_test_api.cc
|
| copy to ash/test/material_design_controller_test_api.cc
|
| index 029af51adc321a48727605588c4a8a7d1696e39e..72414bdad51042eb842867364f123693428c042b 100644
|
| --- a/ui/base/test/material_design_controller_test_api.cc
|
| +++ b/ash/test/material_design_controller_test_api.cc
|
| @@ -1,14 +1,13 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/base/test/material_design_controller_test_api.h"
|
| +#include "ash/test/material_design_controller_test_api.h"
|
|
|
| -namespace ui {
|
| +namespace ash {
|
| namespace test {
|
|
|
| -MaterialDesignControllerTestAPI::MaterialDesignControllerTestAPI(
|
| - MaterialDesignController::Mode mode)
|
| +MaterialDesignControllerTestAPI::MaterialDesignControllerTestAPI(bool mode)
|
| : previous_mode_(MaterialDesignController::mode_),
|
| previous_initialized_(MaterialDesignController::is_mode_initialized_) {
|
| MaterialDesignController::SetMode(mode);
|
| @@ -19,9 +18,15 @@ MaterialDesignControllerTestAPI::~MaterialDesignControllerTestAPI() {
|
| MaterialDesignController::mode_ = previous_mode_;
|
| }
|
|
|
| +// static
|
| +bool MaterialDesignControllerTestAPI::DefaultMode() {
|
| + return MaterialDesignController::DefaultMode();
|
| +}
|
| +
|
| +// static
|
| void MaterialDesignControllerTestAPI::Uninitialize() {
|
| MaterialDesignController::Uninitialize();
|
| }
|
|
|
| } // namespace test
|
| -} // namespace ui
|
| +} // namespace ash
|
|
|