c++ / mojo changes for 'external window mode'

ui/aura/mus/window_tree_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #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"
 #include "ui/aura/mus/drag_drop_controller_host.h"
 #include "ui/aura/mus/focus_synchronizer_delegate.h"
 #include "ui/aura/mus/mus_types.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_host_mus_delegate.h"
 
 namespace display {
@@ skipping 56 matching lines @@
       service_manager::Connector* connector,
       WindowTreeClientDelegate* delegate,
       WindowManagerDelegate* window_manager_delegate = nullptr,
       ui::mojom::WindowTreeClientRequest request = nullptr,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr);
   ~WindowTreeClient() override;
 
   // 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() {
     return capture_synchronizer_.get();
   }
 
   bool connected() const { return tree_ != nullptr; }
   ClientSpecificId client_id() const { return client_id_; }
 
   void SetCanFocus(Window* window, bool can_focus);
@@ skipping 99 matching lines @@
   void SetLocalPropertiesFromServerProperties(
       WindowMus* window,
       const ui::mojom::WindowData& window_data);
 
   // Creates a new WindowTreeHostMus.
   std::unique_ptr<WindowTreeHostMus> CreateWindowTreeHost(
       WindowMusType window_mus_type,
       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 server that we need to
'configure' WindowTreeHostMus instances with.

this is already the case in std::unique_ptr<WindowTreeHostMus>
WindowTreeClient::CreateWindowTreeHost [1].

[1]
https://cs.chromium.org/chromium/src/ui/aura/mus/window_tree_client.cc?q=wind...

I just factored the code out into a method, so that we could call in external
window mode too. See the branch in WindowTreeClient::OnEmbed.

+                                     const ui::mojom::WindowData& window_data);
+
   WindowMus* NewWindowFromWindowData(WindowMus* parent,
                                      const ui::mojom::WindowData& window_data);
 
   // Sets the ui::mojom::WindowTree implementation.
   void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr);
 
   // Called when the connection to the server is established.
   void WindowTreeConnectionEstablished(ui::mojom::WindowTree* window_tree);
 
   // Called when the ui::mojom::WindowTree connection is lost, deletes this.
@@ skipping 284 matching lines @@
   mojo::ScopedSharedBufferMapping cursor_location_mapping_;
 
   base::ObserverList<WindowTreeClientObserver> observers_;
 
   std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>>
       window_manager_internal_;
   ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
 
   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;
 
   // Callback executed when a move loop initiated by PerformWindowMove() is
   // completed.
   base::Callback<void(bool)> on_current_move_finished_;
 
   // The current change id for the window manager.
   uint32_t current_wm_move_loop_change_ = 0u;
   Id current_wm_move_loop_window_id_ = 0u;
 
   std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
 
   base::ObserverList<WindowTreeClientTestObserver> test_observers_;
 
   std::unique_ptr<ui::Gpu> gpu_;
   std::unique_ptr<MusContextFactory> compositor_context_factory_;
 
   // 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);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_