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

Unified Diff: ash/test/material_design_controller_test_api.h

Issue 1921133002: Adds ash::MaterialDesignController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds ash::MaterialDesignController (CHECK_* -> DCHECK_*) Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/test/material_design_controller_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 66%
copy from ui/base/test/material_design_controller_test_api.h
copy to ash/test/material_design_controller_test_api.h
index 3eb53a349f5585ad03e677b5e84478335a66b271..4abd19f8e7c1ed076699d91623c470f0d747a074 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.
@@ -20,16 +20,16 @@ class MaterialDesignControllerTestAPI {
~MaterialDesignControllerTestAPI();
// Wrapper functions for MaterialDesignController internal functions.
+ static MaterialDesignController::Mode DefaultMode();
static void Uninitialize();
private:
const MaterialDesignController::Mode 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_
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/test/material_design_controller_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698