Adds remainder of support for multiple roots to WS

components/mus/ws/connection_manager.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 COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 119 matching lines @@
   // WindowManagerChangeCompleted() is called to obtain the original source
   // and client supplied change_id that initiated the called.
   uint32_t GenerateWindowManagerChangeId(WindowTreeImpl* source,
                                          uint32_t client_change_id);
 
   // Called when a response from the window manager is obtained. Calls to
   // the client that initiated the change with the change id originally
   // supplied by the client.
   void WindowManagerChangeCompleted(uint32_t window_manager_change_id,
                                     bool success);
+  void WindowManagerCreatedTopLevelWindow(WindowTreeImpl* wm_connection,
+                                          uint32_t window_manager_change_id,
+                                          Id transport_window_id);
 
   // These functions trivially delegate to all WindowTreeImpls, which in
   // term notify their clients.
   void ProcessWindowDestroyed(ServerWindow* window);
   void ProcessWindowBoundsChanged(const ServerWindow* window,
                                   const gfx::Rect& old_bounds,
                                   const gfx::Rect& new_bounds);
   void ProcessClientAreaChanged(
       const ServerWindow* window,
       const gfx::Insets& new_client_area,
@@ skipping 29 matching lines @@
     uint32_t client_change_id;
   };
 
   using InFlightWindowManagerChangeMap =
       std::map<uint32_t, InFlightWindowManagerChange>;
 
   bool GetAndClearInFlightWindowManagerChange(
       uint32_t window_manager_change_id,
       InFlightWindowManagerChange* change);
 
+  // Called when we get an unexpected message from the WindowManager.
+  // TODO(sky): decide what we want to do here.
+  void WindowManagerSentBogusMessage(WindowTreeImpl* connection) {}
+
   // Invoked when a connection is about to execute a window server operation.
   // Subsequently followed by FinishOperation() once the change is done.
   //
   // Changes should never nest, meaning each PrepareForOperation() must be
   // balanced with a call to FinishOperation() with no PrepareForOperation()
   // in between.
   void PrepareForOperation(Operation* op);
 
   // Balances a call to PrepareForOperation().
   void FinishOperation();
@@ skipping 78 matching lines @@
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_