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

Unified Diff: components/mus/public/cpp/window_tree_host_factory.h

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/public/cpp/window.h ('k') | components/mus/public/interfaces/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/window_tree_host_factory.h
diff --git a/components/mus/public/cpp/window_tree_host_factory.h b/components/mus/public/cpp/window_tree_host_factory.h
index 4bccf1af6accc04ee28c5f152543ad00ab7c4a43..e94f0bd9e96dcccc9a3f97f1c8e9a8f9b6714b24 100644
--- a/components/mus/public/cpp/window_tree_host_factory.h
+++ b/components/mus/public/cpp/window_tree_host_factory.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
+#include "components/mus/public/interfaces/window_manager.mojom.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
@@ -24,13 +25,15 @@ class WindowTreeDelegate;
void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory,
mojom::WindowTreeHostClientPtr host_client,
WindowTreeDelegate* delegate,
- mojom::WindowTreeHostPtr* host);
+ mojom::WindowTreeHostPtr* host,
+ mojom::WindowManagerPtr window_manager);
// Creates a single host with no client by connecting to the window manager
// application. Useful only for tests and trivial UIs.
void CreateSingleWindowTreeHost(mojo::ApplicationImpl* app,
WindowTreeDelegate* delegate,
- mojom::WindowTreeHostPtr* host);
+ mojom::WindowTreeHostPtr* host,
+ mojom::WindowManagerPtr window_manager);
} // namespace mus
« no previous file with comments | « components/mus/public/cpp/window.h ('k') | components/mus/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698