Makes WindowTree take the AccessPolicy

components/mus/ws/connection_manager.cc

 // 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.
 
 #include "components/mus/ws/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
+#include "components/mus/ws/window_manager_access_policy.h"
 #include "components/mus/ws/window_manager_factory_service.h"
 #include "components/mus/ws/window_manager_state.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
@@ skipping 36 matching lines @@
 
 ConnectionSpecificId ConnectionManager::GetAndAdvanceNextConnectionId() {
   const ConnectionSpecificId id = next_connection_id_++;
   DCHECK_LT(id, next_connection_id_);
   return id;
 }
 
 WindowTree* ConnectionManager::EmbedAtWindow(
     ServerWindow* root,
     const UserId& user_id,
-    mojom::WindowTreeClientPtr client) {
-  scoped_ptr<WindowTree> tree_ptr(new WindowTree(this, user_id, root));
+    mojom::WindowTreeClientPtr client,
+    scoped_ptr<AccessPolicy> access_policy) {
+  scoped_ptr<WindowTree> tree_ptr(
+      new WindowTree(this, user_id, root, std::move(access_policy)));
   WindowTree* tree = tree_ptr.get();
 
   mojom::WindowTreePtr window_tree_ptr;
   scoped_ptr<WindowTreeBinding> binding =
       delegate_->CreateWindowTreeBindingForEmbedAtWindow(
           this, tree, GetProxy(&window_tree_ptr), std::move(client));
 
   AddTree(std::move(tree_ptr), std::move(binding), std::move(window_tree_ptr));
   OnTreeMessagedClient(tree->id());
   return tree;
@@ skipping 10 matching lines @@
 }
 
 WindowTree* ConnectionManager::CreateTreeForWindowManager(
     Display* display,
     mojom::WindowManagerFactory* factory,
     ServerWindow* root,
     const UserId& user_id) {
   mojom::DisplayPtr display_ptr = display->ToMojomDisplay();
   mojom::WindowTreeClientPtr tree_client;
   factory->CreateWindowManager(std::move(display_ptr), GetProxy(&tree_client));
-  scoped_ptr<WindowTree> tree_ptr(new WindowTree(this, user_id, root));
+  scoped_ptr<WindowTree> tree_ptr(new WindowTree(
+      this, user_id, root, make_scoped_ptr(new WindowManagerAccessPolicy)));
   WindowTree* tree = tree_ptr.get();
   scoped_ptr<DefaultWindowTreeBinding> binding(new DefaultWindowTreeBinding(
       tree_ptr.get(), this, std::move(tree_client)));
   mojom::WindowTreePtr window_tree_ptr = binding->CreateInterfacePtrAndBind();
   AddTree(std::move(tree_ptr), std::move(binding), std::move(window_tree_ptr));
   tree->ConfigureWindowManager();
   return tree;
 }
 
 void ConnectionManager::DestroyTree(WindowTree* tree) {
@@ skipping 474 matching lines @@
 void ConnectionManager::OnFirstDisplayReady() {
   delegate_->OnFirstDisplayReady();
 }
 
 void ConnectionManager::OnNoMoreDisplays() {
   delegate_->OnNoMoreDisplays();
 }
 
 }  // namespace ws
 }  // namespace mus