Changes ownership of WindowTreeHostConnection

components/mus/ws/window_tree_host_impl.h

 // Copyright 2015 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 COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 11 matching lines @@
 #include "components/mus/ws/focus_controller_observer.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/server_window_tracker.h"
 
 namespace mus {
 namespace ws {
 
 class ConnectionManager;
 class FocusController;
-class WindowTreeHostDelegate;
+class WindowTreeHostConnection;
 class WindowTreeImpl;
 
 // WindowTreeHostImpl is an implementation of the WindowTreeHost interface.
 // It serves as a top level root window for a window. Its lifetime is managed by
 // ConnectionManager. If the connection to the client breaks or if the user
 // closes the associated window, then this object and related state will be
 // deleted.
 class WindowTreeHostImpl : public DisplayManagerDelegate,
                            public mojom::WindowTreeHost,
                            public FocusControllerObserver,
                            public FocusControllerDelegate,
                            public EventDispatcherDelegate,
                            public ServerWindowObserver {
  public:
   // TODO(fsamuel): All these parameters are just plumbing for creating
   // DisplayManagers. We should probably just store these common parameters
   // in the DisplayManagerFactory and pass them along on DisplayManager::Create.
   WindowTreeHostImpl(ConnectionManager* connection_manager,
                      mojo::Connector* connector,
                      const scoped_refptr<GpuState>& gpu_state,
                      const scoped_refptr<SurfacesState>& surfaces_state);
   ~WindowTreeHostImpl() override;
 
   // Initializes state that depends on the existence of a WindowTreeHostImpl.
-  void Init(WindowTreeHostDelegate* delegate);
+  void Init(scoped_ptr<WindowTreeHostConnection> connection);
 
   uint32_t id() const { return id_; }
 
   const WindowTreeImpl* GetWindowTree() const;
   WindowTreeImpl* GetWindowTree();
 
   void SetFrameDecorationValues(mojom::FrameDecorationValuesPtr values);
   const mojom::FrameDecorationValues& frame_decoration_values() const {
     return *frame_decoration_values_;
   }
@@ skipping 81 matching lines @@
   // The second case happens if EventDispatcher generates more than one event
   // at a time.
   struct QueuedEvent {
     QueuedEvent();
     ~QueuedEvent();
 
     mojom::EventPtr event;
     scoped_ptr<ProcessedEventTarget> processed_target;
   };
 
+  // Inits the necessary state once the display is ready.
+  void CallOnDisplayInitializedIfNecessary();
+
   void OnEventAckTimeout();
 
   // Schedules an event to be processed later.
   void QueueEvent(mojom::EventPtr event,
                   scoped_ptr<ProcessedEventTarget> processed_event_target);
 
   // Processes the next valid event in |event_queue_|. If the event has already
   // been processed it is dispatched, otherwise the event is passed to the
   // EventDispatcher for processing.
   void ProcessNextEventFromQueue();
@@ skipping 34 matching lines @@
   void ReleaseNativeCapture() override;
   void OnServerWindowCaptureLost(ServerWindow* window) override;
   void DispatchInputEventToWindow(ServerWindow* target,
                                   bool in_nonclient_area,
                                   mojom::EventPtr event) override;
 
   // ServerWindowObserver:
   void OnWindowDestroyed(ServerWindow* window) override;
 
   const uint32_t id_;
-  WindowTreeHostDelegate* delegate_;
+  scoped_ptr<WindowTreeHostConnection> window_tree_host_connection_;
+  WindowTreeImpl* window_tree_ = nullptr;
   ConnectionManager* const connection_manager_;
   EventDispatcher event_dispatcher_;
   scoped_ptr<ServerWindow> root_;
   scoped_ptr<DisplayManager> display_manager_;
   scoped_ptr<FocusController> focus_controller_;
   mojom::WindowTree* tree_awaiting_input_ack_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   int32_t last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
   // Set of windows with surfaces that need to be destroyed once the frame
   // draws.
   std::set<ServerWindow*> windows_needing_frame_destruction_;
 
   std::queue<scoped_ptr<QueuedEvent>> event_queue_;
   base::OneShotTimer event_ack_timer_;
 
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostImpl);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_