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

Unified Diff: ash/mus/test/wm_test_helper.cc

Issue 2203003003: Get AcceleratorControllerTest working with mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/property_util.cc ('k') | ash/test/ash_md_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/test/wm_test_helper.cc
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index 760599deca94392eae3185714b7560d4ee618de0..7ca9a6fff04b6bd0ffe60c06012ccff9ad870576 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -4,6 +4,8 @@
#include "ash/mus/test/wm_test_helper.h"
+#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/test/material_design_controller_test_api.h"
#include "ash/mus/root_window_controller.h"
#include "ash/mus/test/wm_test_screen.h"
#include "ash/mus/window_manager.h"
@@ -13,6 +15,8 @@
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/cpp/tests/window_tree_client_private.h"
#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/test/material_design_controller_test_api.h"
#include "ui/display/display.h"
namespace ash {
@@ -20,9 +24,15 @@ namespace mus {
WmTestHelper::WmTestHelper() {}
-WmTestHelper::~WmTestHelper() {}
+WmTestHelper::~WmTestHelper() {
+ ash::test::MaterialDesignControllerTestAPI::Uninitialize();
+ ui::test::MaterialDesignControllerTestAPI::Uninitialize();
+}
void WmTestHelper::Init() {
+ ui::MaterialDesignController::Initialize();
+ ash::MaterialDesignController::Initialize();
+
message_loop_.reset(new base::MessageLoopForUI());
window_manager_app_.window_manager_.reset(new WindowManager(nullptr));
screen_ = new WmTestScreen;
« no previous file with comments | « ash/mus/property_util.cc ('k') | ash/test/ash_md_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698