Wires up transient windows for aura-mus

ui/aura/mus/window_port_mus.cc

 // Copyright 2016 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 "ui/aura/mus/window_port_mus.h"
 
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/surface_id_handler.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 
 namespace aura {
 
@@ skipping 59 matching lines @@
 
 bool WindowPortMus::RemoveChangeByTypeAndData(const ServerChangeType type,
                                               const ServerChangeData& data) {
   for (auto iter = server_changes_.begin(); iter != server_changes_.end();
        ++iter) {
     if (iter->type != type)
       continue;
 
     switch (type) {
       case ServerChangeType::ADD:
+      case ServerChangeType::ADD_TRANSIENT:
       case ServerChangeType::REMOVE:
+      case ServerChangeType::REMOVE_TRANSIENT:
       case ServerChangeType::REORDER:
         if (iter->data.child_id == data.child_id)
           break;
         continue;
       case ServerChangeType::BOUNDS:
         if (iter->data.bounds == data.bounds)
           break;
         continue;
       case ServerChangeType::PROPERTY:
         if (iter->data.property_name == data.property_name)
@@ skipping 107 matching lines @@
     }
   }
   WindowPortMus* parent = Get(window_->parent());
   if (parent && parent->surface_id_handler_) {
     parent->surface_id_handler_->OnChildWindowSurfaceChanged(window_,
                                                              &surface_info);
   }
   surface_info_ = std::move(surface_info);
 }
 
+void WindowPortMus::AddTransientChildFromServer(WindowMus* child) {
+  DCHECK(has_server_window());
+  ServerChangeData data;
+  data.child_id = child->server_id();
+  ScopedServerChange change(this, ServerChangeType::ADD_TRANSIENT, data);
+  client::GetTransientWindowClient()->AddTransientChild(window_,
+                                                        child->GetWindow());
+}
+
+void WindowPortMus::RemoveTransientChildFromServer(WindowMus* child) {
+  DCHECK(has_server_window());
+  ServerChangeData data;
+  data.child_id = child->server_id();
+  ScopedServerChange change(this, ServerChangeType::REMOVE_TRANSIENT, data);
+  client::GetTransientWindowClient()->RemoveTransientChild(window_,
+                                                           child->GetWindow());
+}
+
+WindowPortMus::ChangeSource WindowPortMus::OnTransientChildAdded(
+    WindowMus* child) {
+  DCHECK(has_server_window());
+  ServerChangeData change_data;
+  change_data.child_id = child->server_id();
+  // If there was a change it means we scheduled the change by way of
+  // AddTransientChildFromServer(), which came from the server.
+  return RemoveChangeByTypeAndData(ServerChangeType::ADD_TRANSIENT, change_data)
+             ? ChangeSource::SERVER
+             : ChangeSource::LOCAL;
+}
+
+WindowPortMus::ChangeSource WindowPortMus::OnTransientChildRemoved(
+    WindowMus* child) {
+  DCHECK(has_server_window());
+  ServerChangeData change_data;
+  change_data.child_id = child->server_id();
+  // If there was a change it means we scheduled the change by way of
+  // RemoveTransientChildFromServer(), which came from the server.
+  return RemoveChangeByTypeAndData(ServerChangeType::REMOVE_TRANSIENT,
+                                   change_data)
+             ? ChangeSource::SERVER
+             : ChangeSource::LOCAL;
+}
+
 std::unique_ptr<WindowMusChangeData>
 WindowPortMus::PrepareForServerBoundsChange(const gfx::Rect& bounds) {
   std::unique_ptr<WindowMusChangeDataImpl> data(
       base::MakeUnique<WindowMusChangeDataImpl>());
   ServerChangeData change_data;
   change_data.bounds = bounds;
   data->change = base::MakeUnique<ScopedServerChange>(
       this, ServerChangeType::BOUNDS, change_data);
   return std::move(data);
 }
@@ skipping 94 matching lines @@
   change_data.property_name =
       GetPropertyConverter()->GetTransportNameForPropertyKey(key);
   // TODO(sky): investigate to see if we need to compare data. In particular do
   // we ever have a case where changing a property cascades into changing the
   // same property?
   if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data))
     window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data));
 }
 
 }  // namespace aura