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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/window_manager.cc

Issue 2694623016: chromeos: Makes AshTestBase/Helper target mash when appropriate (Closed)
Patch Set: cleanup Created 3 years, 10 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
« ash/mus/bridge/wm_shell_mus.cc ('K') | « ash/mus/window_manager.h ('k') | ash/mus/window_manager_application.h » ('j') | ash/mus/window_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 27315befbecd62722af5b14f070d44d9a441b508..26879415f2f793a6fcd7aa06b6c8d56fddd16721 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -195,7 +195,8 @@ void WindowManager::CreateShell(
WmWindow::Get(window_tree_host->window()),
shell_delegate_for_test_ ? std::move(shell_delegate_for_test_)
: base::MakeUnique<ShellDelegateMus>(connector_),
- this, pointer_watcher_event_router_.get());
+ this, pointer_watcher_event_router_.get(),
+ create_session_state_delegate_stub_for_test_);
init_params.primary_window_tree_host = window_tree_host.release();
init_params.wm_shell = wm_shell;
init_params.blocking_pool = blocking_pool_.get();
« ash/mus/bridge/wm_shell_mus.cc ('K') | « ash/mus/window_manager.h ('k') | ash/mus/window_manager_application.h » ('j') | ash/mus/window_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698