Makes resolving ids work correctly in new world

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/client_connection.h"
 #include "components/mus/ws/connection_manager_delegate.h"
@@ skipping 517 matching lines @@
 
 void ConnectionManager::ScheduleSurfaceDestruction(ServerWindow* window) {
   for (auto& pair : host_connection_map_) {
     if (pair.first->root_window()->Contains(window)) {
       pair.first->ScheduleSurfaceDestruction(window);
       break;
     }
   }
 }
 
+ServerWindow* ConnectionManager::FindWindowForSurface(
+    const ServerWindow* ancestor,
+    mojom::SurfaceType surface_type,
+    const ClientWindowId& client_window_id) {
+  WindowTreeImpl* window_tree = GetConnection(ancestor->id().connection_id);
+  if (!window_tree)
+    return nullptr;
+  if (surface_type == mojom::SurfaceType::DEFAULT) {
+    // At embed points the default surface comes from the embedded app.
+    WindowTreeImpl* connection_with_root = GetConnectionWithRoot(ancestor);
+    if (connection_with_root)
+      window_tree = connection_with_root;
+  }
+  return window_tree->GetWindowByClientId(client_window_id);
+}
+
 void ConnectionManager::OnWindowDestroyed(ServerWindow* window) {
   if (!in_destructor_)
     ProcessWindowDeleted(window);
 }
 
 void ConnectionManager::OnWillChangeWindowHierarchy(ServerWindow* window,
                                                     ServerWindow* new_parent,
                                                     ServerWindow* old_parent) {
   if (in_destructor_)
     return;
@@ skipping 125 matching lines @@
   if (!got_valid_frame_decorations_) {
     display_manager_observers_.AddInterfacePtr(std::move(observer));
     return;
   }
   CallOnDisplays(observer.get());
   display_manager_observers_.AddInterfacePtr(std::move(observer));
 }
 
 }  // namespace ws
 }  // namespace mus