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

Unified Diff: ash/shell.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: cleanup Created 4 years, 3 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8c92ec3d2bbe7a9d751d20d0a4dbb2fce8be4a3b..9ee9c886b7052a74c804be6328ae6bf26dafcb0e 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -607,7 +607,8 @@ Shell::~Shell() {
}
void Shell::Init(const ShellInitParams& init_params) {
- wm_shell_->Initialize(init_params.blocking_pool);
+ // HACK: In real life, this would have a shell::Connector as well.
+ wm_shell_->Initialize(init_params.blocking_pool, nullptr);
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();

Powered by Google App Engine
This is Rietveld 408576698