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

Unified Diff: components/mus/ws/window_tree_host_impl.cc

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces Created 5 years, 2 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 | « components/mus/ws/window_tree_host_impl.h ('k') | components/mus/ws/window_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_host_impl.cc
diff --git a/components/mus/ws/window_tree_host_impl.cc b/components/mus/ws/window_tree_host_impl.cc
index 6b87898daf876c3970d1f00a22699bc3a1c683c3..345c73ef6bd974712cb6028e7da5b0402d7a72f5 100644
--- a/components/mus/ws/window_tree_host_impl.cc
+++ b/components/mus/ws/window_tree_host_impl.cc
@@ -22,14 +22,16 @@ WindowTreeHostImpl::WindowTreeHostImpl(
ConnectionManager* connection_manager,
mojo::ApplicationImpl* app_impl,
const scoped_refptr<GpuState>& gpu_state,
- const scoped_refptr<SurfacesState>& surfaces_state)
+ const scoped_refptr<SurfacesState>& surfaces_state,
+ mojom::WindowManagerPtr window_manager)
: delegate_(nullptr),
connection_manager_(connection_manager),
client_(client.Pass()),
event_dispatcher_(this),
display_manager_(
DisplayManager::Create(app_impl, gpu_state, surfaces_state)),
- focus_controller_(new FocusController(this)) {
+ focus_controller_(new FocusController(this)),
+ window_manager_(window_manager.Pass()) {
display_manager_->Init(this);
if (client_) {
client_.set_connection_error_handler(base::Bind(
« no previous file with comments | « components/mus/ws/window_tree_host_impl.h ('k') | components/mus/ws/window_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698