Makes WindowTree take the AccessPolicy

components/mus/ws/window_tree.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/window_tree.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/connection_manager.h"
 #include "components/mus/ws/default_access_policy.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/focus_controller.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_observer.h"
-#include "components/mus/ws/window_manager_access_policy.h"
 #include "components/mus/ws/window_manager_state.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/ime/ime_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "ui/platform_window/text_input_state.h"
 
 using mojo::Array;
 using mojo::Callback;
@@ skipping 27 matching lines @@
   }
 
   ServerWindow* target_;
   mojom::EventPtr event_;
 
   DISALLOW_COPY_AND_ASSIGN(TargetedEvent);
 };
 
 WindowTree::WindowTree(ConnectionManager* connection_manager,
                        const UserId& user_id,
-                       ServerWindow* root)
+                       ServerWindow* root,
+                       scoped_ptr<AccessPolicy> access_policy)
     : connection_manager_(connection_manager),
       user_id_(user_id),
       id_(connection_manager_->GetAndAdvanceNextConnectionId()),
       next_window_id_(1),
+      access_policy_(std::move(access_policy)),
       event_ack_id_(0),
       window_manager_internal_(nullptr) {
   if (root)
     roots_.insert(root);
-  // TODO(sky): pass in type rather than inferring it.
-  if (root && root->id().connection_id == kInvalidConnectionId)
-    access_policy_.reset(new WindowManagerAccessPolicy(id_, this));
-  else
-    access_policy_.reset(new DefaultAccessPolicy(id_, this));
+  access_policy_->Init(id_, this);
 }
 
 WindowTree::~WindowTree() {
   DestroyWindows();
 }
 
 void WindowTree::Init(scoped_ptr<WindowTreeBinding> binding,
                       mojom::WindowTreePtr tree) {
   DCHECK(!binding_);
   binding_ = std::move(binding);
@@ skipping 178 matching lines @@
 }
 
 bool WindowTree::Embed(const ClientWindowId& window_id,
                        mojom::WindowTreeClientPtr client) {
   if (!client || !CanEmbed(window_id))
     return false;
   ServerWindow* window = GetWindowByClientId(window_id);
   PrepareForEmbed(window);
   // When embedding we don't know the user id of where the TreeClient came
   // from. Use an invalid id, which limits what the client is able to do.
-  connection_manager_->EmbedAtWindow(window, InvalidUserId(),
-                                     std::move(client));
+  connection_manager_->EmbedAtWindow(window, InvalidUserId(), std::move(client),
+                                     make_scoped_ptr(new DefaultAccessPolicy));
   return true;
 }
 
 void WindowTree::DispatchInputEvent(ServerWindow* target,
                                     mojom::EventPtr event) {
   if (event_ack_id_) {
     // This is currently waiting for an event ack. Add it to the queue.
     event_queue_.push(
         make_scoped_ptr(new TargetedEvent(target, std::move(event))));
     // TODO(sad): If the |event_queue_| grows too large, then this should notify
@@ skipping 1072 matching lines @@
 }
 
 bool WindowTree::IsWindowRootOfAnotherTreeForAccessPolicy(
     const ServerWindow* window) const {
   WindowTree* tree = connection_manager_->GetTreeWithRoot(window);
   return tree && tree != this;
 }
 
 }  // namespace ws
 }  // namespace mus