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

Unified Diff: ash/test/ash_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/shell.cc ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 7709a75f95685c0f5d9cd53b4720af5f03322224..338357ef7a41d39b12eb8602fb4b3f5753b638e4 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -13,6 +13,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/shell.h"
#include "ash/shell_init_params.h"
#include "ash/system/chromeos/screen_layout_observer.h"
@@ -287,8 +288,9 @@ void AshTestHelper::CreateMashWindowManager() {
CHECK(IsMash());
window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>();
- window_manager_app_->window_manager_.reset(new mus::WindowManager(nullptr));
- window_manager_app_->window_manager()->shell_delegate_for_test_.reset(
+ window_manager_app_->window_manager_.reset(
+ new mus::WindowManager(nullptr, Config::MASH));
+ window_manager_app_->window_manager()->shell_delegate_.reset(
test_shell_delegate_);
window_manager_app_->window_manager()
->create_session_state_delegate_stub_for_test_ = false;
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698