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

Unified Diff: ash/mus/window_manager.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Fix nit. 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
« no previous file with comments | « ash/mus/window_manager.h ('k') | ash/mus/window_manager_application.h » ('j') | no next file with comments »
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 5ae3cc5776dd5f3e15b6d90d711622925ee5fea3..69a2992a7c08fb222113a7bf0d9fe96b2881f42e 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -74,7 +74,8 @@ WindowManager::~WindowManager() {
}
void WindowManager::Init(
- std::unique_ptr<ui::WindowTreeClient> window_tree_client) {
+ std::unique_ptr<ui::WindowTreeClient> window_tree_client,
+ const scoped_refptr<base::SequencedWorkerPool>& blocking_pool) {
DCHECK(!window_tree_client_);
window_tree_client_ = std::move(window_tree_client);
@@ -101,7 +102,7 @@ void WindowManager::Init(
base::MakeUnique<AppListPresenterStub>(), connector_));
shell_.reset(new WmShellMus(std::move(shell_delegate), this,
pointer_watcher_event_router_.get()));
- shell_->Initialize();
+ shell_->Initialize(blocking_pool);
lookup_.reset(new WmLookupMus);
}
« no previous file with comments | « ash/mus/window_manager.h ('k') | ash/mus/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698