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

services/ui/ws/window_server.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 SERVICES_UI_WS_WINDOW_SERVER_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "cc/ipc/display_compositor.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/gpu_host_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
+#include "services/ui/ws/window_tree_host_factory.h"
 
 namespace ui {
 namespace ws {
 
 class AccessPolicy;
 class Display;
 class DisplayManager;
 class GpuHost;
 class ServerWindow;
 class UserActivityMonitor;
@@ skipping 89 matching lines @@
         const_cast<const WindowServer*>(this)->GetTreeWithRoot(window));
   }
   const WindowTree* GetTreeWithRoot(const ServerWindow* window) const;
 
   UserActivityMonitor* GetUserActivityMonitorForUser(const UserId& user_id);
 
   WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set() {
     return &window_manager_window_tree_factory_set_;
   }
 
+  WindowTreeHostFactory* window_tree_host_factory() {
+    return window_tree_host_factory_.get();
+  }
+
+  void set_window_tree_host_factory(
+      std::unique_ptr<WindowTreeHostFactory> factory) {
+    DCHECK(factory);
+    window_tree_host_factory_ = std::move(factory);
+  }
+
   // Sets focus to |window|. Returns true if |window| already has focus, or
   // focus was successfully changed. Returns |false| if |window| is not a valid
   // window to receive focus.
   bool SetFocusedWindow(ServerWindow* window);
   ServerWindow* GetFocusedWindow();
 
+  void SetInExternalWindowMode() { in_external_window_mode = true; }
+  bool IsInExternalWindowMode() const { return in_external_window_mode; }
+
   bool IsActiveUserInHighContrastMode() const;
   void SetHighContrastMode(const UserId& user, bool enabled);
 
   // Returns a change id for the window manager that is associated with
   // |source| and |client_change_id|. When the window manager replies
   // WindowManagerChangeCompleted() is called to obtain the original source
   // and client supplied change_id that initiated the called.
   uint32_t GenerateWindowManagerChangeId(WindowTree* source,
                                          uint32_t client_change_id);
 
@@ skipping 217 matching lines @@
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
   std::unique_ptr<GpuHost> gpu_host_;
   base::Callback<void(ServerWindow*)> window_paint_callback_;
 
   UserActivityMonitorMap activity_monitor_map_;
 
   WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
 
+  std::unique_ptr<WindowTreeHostFactory> window_tree_host_factory_;

[kylechar, 2017/03/07 18:19:37]

There is already a WindowTreeHostFactory in ui::Service for each user? Why add
this?

[tonikitoo, 2017/03/07 20:09:36]

I tried to avoid it, and saw that service has a WindowTreeHostFactory instance.

I added it to access the WindowTree of this WindowTreeHostFactory, and I could
not find my way to get it through ws::Service. Will see if I can improve it.

+
   cc::SurfaceId root_surface_id_;
 
   mojo::Binding<cc::mojom::DisplayCompositorClient>
       display_compositor_client_binding_;
   // State for rendering into a Surface.
   cc::mojom::DisplayCompositorPtr display_compositor_;
 
+  bool in_external_window_mode = false;
+
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_H_