Index: ui/aura/mus/window_tree_client.h |
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h |
index 3e42a2ef2ad82ef9eee1425bc0a0396e3f2e31d9..1621e48ff88ab39aec5bb335f0f42a86dca7ee98 100644 |
--- a/ui/aura/mus/window_tree_client.h |
+++ b/ui/aura/mus/window_tree_client.h |
@@ -21,6 +21,7 @@ |
#include "mojo/public/cpp/bindings/associated_binding.h" |
#include "mojo/public/cpp/bindings/strong_binding.h" |
#include "services/ui/public/interfaces/window_tree.mojom.h" |
+#include "services/ui/public/interfaces/window_tree_host.mojom.h" |
#include "ui/aura/aura_export.h" |
#include "ui/aura/client/transient_window_client_observer.h" |
#include "ui/aura/mus/capture_synchronizer_delegate.h" |
@@ -97,9 +98,17 @@ class AURA_EXPORT WindowTreeClient |
// Establishes the connection by way of the WindowTreeFactory. |
void ConnectViaWindowTreeFactory(); |
+ // Establishes the connection by way of the WindowTreeFactoryHost. |
+ void ConnectViaWindowTreeHostFactory(); |
+ |
// Establishes the connection by way of WindowManagerWindowTreeFactory. |
void ConnectAsWindowManager(); |
+ // Triggers the creation of a mojom::WindowTreeHost (aka ws::Display) |
+ // instance on the server side. |
+ // Ends up calling back to client side, aura::WindowTreeClient::OnEmbed. |
+ void CreateHost(ui::mojom::WindowTreeHostRequest host, uint32_t client_id); |
+ |
service_manager::Connector* connector() { return connector_; } |
ui::Gpu* gpu() { return gpu_.get(); } |
CaptureSynchronizer* capture_synchronizer() { |
@@ -219,6 +228,9 @@ class AURA_EXPORT WindowTreeClient |
const ui::mojom::WindowData& window_data, |
int64_t display_id); |
+ void ConfigureWindowDataFromServer(WindowTreeHostMus* window_tree_host, |
kylechar
2017/03/07 18:19:39
What does this do?
tonikitoo
2017/03/07 20:09:36
There is some 'window data' info coming from the s
|
+ const ui::mojom::WindowData& window_data); |
+ |
WindowMus* NewWindowFromWindowData(WindowMus* parent, |
const ui::mojom::WindowData& window_data); |
@@ -523,6 +535,8 @@ class AURA_EXPORT WindowTreeClient |
bool has_pointer_watcher_ = false; |
+ bool in_external_window_mode_ = false; |
+ |
// The current change id for the client. |
uint32_t current_move_loop_change_ = 0u; |
@@ -544,6 +558,9 @@ class AURA_EXPORT WindowTreeClient |
// If |compositor_context_factory_| is installed on Env, then this is the |
// ContextFactory that was set on Env originally. |
ui::ContextFactory* initial_context_factory_ = nullptr; |
+ |
+ ui::mojom::WindowTreeHostFactoryPtr window_tree_host_factory_ptr_; |
+ |
base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |