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

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

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 years, 9 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/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager.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 84e87ac4d53a08f6c804569c1eb80eeba89e5d67..430f0b5099623666f5a38fb1dca832f567805874 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -9,6 +9,7 @@
#include "ash/mus/screen_mus.h"
#include "ash/mus/window_manager.h"
#include "ash/mus/window_manager_application.h"
+#include "ash/public/cpp/config.h"
#include "ash/test/test_shell_delegate.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
@@ -99,8 +100,9 @@ void WmTestHelper::Init() {
blocking_pool_owner_ = base::MakeUnique<base::SequencedWorkerPoolOwner>(
kMaxNumberThreads, kThreadNamePrefix);
- window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
- window_manager_app_->window_manager()->shell_delegate_for_test_ =
+ window_manager_app_->window_manager_ =
+ base::MakeUnique<WindowManager>(nullptr, Config::MASH);
+ window_manager_app_->window_manager()->shell_delegate_ =
base::MakeUnique<test::TestShellDelegate>();
window_tree_client_setup_.InitForWindowManager(
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698