Changes ownership of ClientConnection

components/mus/ws/window_tree_impl.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_WINDOW_TREE_IMPL_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/access_policy_delegate.h"
+#include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/ids.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 namespace gfx {
 class Insets;
 class Rect;
 }
 
 namespace mus {
 namespace ws {
@@ skipping 11 matching lines @@
 // internal state) as necessary.
 class WindowTreeImpl : public mojom::WindowTree,
                        public AccessPolicyDelegate,
                        public mojom::WindowManagerClient {
  public:
   WindowTreeImpl(ConnectionManager* connection_manager,
                  ServerWindow* root,
                  uint32_t policy_bitmask);
   ~WindowTreeImpl() override;
 
-  void Init(mojom::WindowTreeClient* client, mojom::WindowTreePtr tree);
+  void Init(scoped_ptr<ClientConnection> client_connection,
+            mojom::WindowTreePtr tree);
 
   // Called if this WindowTreeImpl hosts the WindowManager. This happens if
   // this WindowTreeImpl serves as the root of a WindowTreeHost.
   void ConfigureWindowManager();
 
   ConnectionSpecificId id() const { return id_; }
 
-  mojom::WindowTreeClient* client() { return client_; }
+  mojom::WindowTreeClient* client() { return client_connection_->client(); }
 
   // Returns the Window with the specified id.
   ServerWindow* GetWindow(const WindowId& id) {
     return const_cast<ServerWindow*>(
         const_cast<const WindowTreeImpl*>(this)->GetWindow(id));
   }
   const ServerWindow* GetWindow(const WindowId& id) const;
 
   // Returns the Window with the specified client id *only* if known to this
   // client, returns null if not known.
@@ skipping 291 matching lines @@
       const ServerWindow* window) const override;
   bool IsDescendantOfEmbedRoot(const ServerWindow* window) override;
 
   ConnectionManager* connection_manager_;
 
   // Id of this connection as assigned by ConnectionManager.
   const ConnectionSpecificId id_;
 
   ConnectionSpecificId next_window_id_;
 
-  mojom::WindowTreeClient* client_;
+  scoped_ptr<ClientConnection> client_connection_;
 
   scoped_ptr<mus::ws::AccessPolicy> access_policy_;
 
   // The roots, or embed points, of this connection. A WindowTreeImpl may have
   // any number of roots, including 0.
   std::set<const ServerWindow*> roots_;
 
   // The windows created by this connection. This connection owns these objects.
   base::hash_map<WindowId, ServerWindow*> created_window_map_;
 
@@ skipping 18 matching lines @@
 
   scoped_ptr<WaitingForTopLevelWindowInfo> waiting_for_top_level_window_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeImpl);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_IMPL_H_