| Index: ash/test/material_design_controller_test_api.h
|
| diff --git a/ui/base/test/material_design_controller_test_api.h b/ash/test/material_design_controller_test_api.h
|
| similarity index 58%
|
| copy from ui/base/test/material_design_controller_test_api.h
|
| copy to ash/test/material_design_controller_test_api.h
|
| index 3eb53a349f5585ad03e677b5e84478335a66b271..f3da45aab16ca76d08c03ea30a80ec38e6cea168 100644
|
| --- a/ui/base/test/material_design_controller_test_api.h
|
| +++ b/ash/test/material_design_controller_test_api.h
|
| @@ -1,14 +1,14 @@
|
| -// 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.
|
|
|
| -#ifndef UI_BASE_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
| -#define UI_BASE_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
| +#ifndef ASH_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
| +#define ASH_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
|
|
| +#include "ash/material_design/material_design_controller.h"
|
| #include "base/macros.h"
|
| -#include "ui/base/material_design/material_design_controller.h"
|
|
|
| -namespace ui {
|
| +namespace ash {
|
| namespace test {
|
|
|
| // Test API to access the internal state of the MaterialDesignController class.
|
| @@ -16,20 +16,21 @@ namespace test {
|
| // state in MaterialDesignController class.
|
| class MaterialDesignControllerTestAPI {
|
| public:
|
| - explicit MaterialDesignControllerTestAPI(MaterialDesignController::Mode mode);
|
| + explicit MaterialDesignControllerTestAPI(bool mode);
|
| ~MaterialDesignControllerTestAPI();
|
|
|
| // Wrapper functions for MaterialDesignController internal functions.
|
| + static bool DefaultMode();
|
| static void Uninitialize();
|
|
|
| private:
|
| - const MaterialDesignController::Mode previous_mode_;
|
| + const bool previous_mode_;
|
| const bool previous_initialized_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MaterialDesignControllerTestAPI);
|
| };
|
|
|
| } // namespace test
|
| -} // namespace ui
|
| +} // namespace ash
|
|
|
| -#endif // UI_BASE_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
| +#endif // ASH_TEST_MATERIAL_DESIGN_CONTROLLER_TEST_API_H_
|
|
|