Removes WindowTreeImpl::creator_id_

components/mus/ws/window_tree_impl.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_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 46 matching lines @@
     target_ = nullptr;
   }
 
   ServerWindow* target_;
   mojom::EventPtr event_;
 
   DISALLOW_COPY_AND_ASSIGN(TargetedEvent);
 };
 
 WindowTreeImpl::WindowTreeImpl(ConnectionManager* connection_manager,
-                               ConnectionSpecificId creator_id,
                                const WindowId& root_id,
                                uint32_t policy_bitmask)
     : connection_manager_(connection_manager),
       id_(connection_manager_->GetAndAdvanceNextConnectionId()),
-      creator_id_(creator_id),
       client_(nullptr),
       event_ack_id_(0),
       is_embed_root_(false),
       window_manager_internal_(nullptr) {
   ServerWindow* window = GetWindow(root_id);
   CHECK(window);
   root_.reset(new WindowId(root_id));
   if (window->GetRoot() == window) {
     access_policy_.reset(new WindowManagerAccessPolicy(id_, this));
     is_embed_root_ = true;
@@ skipping 43 matching lines @@
   return root_.get() && *root_ == id;
 }
 
 WindowTreeHostImpl* WindowTreeImpl::GetHost() const {
   return root_.get()
              ? connection_manager_->GetWindowTreeHostByWindow(GetWindow(*root_))
              : nullptr;
 }
 
 void WindowTreeImpl::OnWillDestroyWindowTreeImpl(WindowTreeImpl* connection) {
-  if (creator_id_ == connection->id())
-    creator_id_ = kInvalidConnectionId;
   const ServerWindow* connection_root =
       connection->root_ ? connection->GetWindow(*connection->root_) : nullptr;
   if (connection_root &&
       ((connection_root->id().connection_id == id_ &&
         window_map_.count(connection_root->id().window_id) > 0) ||
        (is_embed_root_ && IsWindowKnown(connection_root)))) {
     client()->OnEmbeddedAppDisconnected(
         WindowIdToTransportId(*connection->root_));
   }
   if (root_.get() && root_->connection_id == connection->id())
@@ skipping 70 matching lines @@
 
 bool WindowTreeImpl::Embed(const WindowId& window_id,
                            mojom::WindowTreeClientPtr client,
                            uint32_t policy_bitmask,
                            ConnectionSpecificId* connection_id) {
   *connection_id = kInvalidConnectionId;
   if (!client.get() || !CanEmbed(window_id, policy_bitmask))
     return false;
   PrepareForEmbed(window_id);
   WindowTreeImpl* new_connection = connection_manager_->EmbedAtWindow(
-      id_, window_id, policy_bitmask, std::move(client));
+      window_id, policy_bitmask, std::move(client));
   if (is_embed_root_)
     *connection_id = new_connection->id();
   return true;
 }
 
 void WindowTreeImpl::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(
@@ skipping 769 matching lines @@
   return connection && connection != this;
 }
 
 bool WindowTreeImpl::IsDescendantOfEmbedRoot(const ServerWindow* window) {
   return is_embed_root_ && root_ && GetWindow(*root_)->Contains(window);
 }
 
 }  // namespace ws
 
 }  // namespace mus