Fixes to WindowTreeHostMus

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/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 {
 
+WindowPortMus::WindowMusChangeDataImpl::WindowMusChangeDataImpl() = default;
+
+WindowPortMus::WindowMusChangeDataImpl::~WindowMusChangeDataImpl() = default;
+
 // static
 WindowMus* WindowMus::Get(Window* window) {
   return WindowPortMus::Get(window);
 }
 
-WindowPortMus::WindowPortMus(WindowTreeClient* client)
-    : window_tree_client_(client) {}
+WindowPortMus::WindowPortMus(WindowTreeClient* client,
+                             bool create_remote_window)
+    : WindowMus(create_remote_window), window_tree_client_(client) {}
 
 WindowPortMus::~WindowPortMus() {
   if (surface_info_)
     SetSurfaceIdFromServer(nullptr);
 
   window_tree_client_->OnWindowMusDestroyed(this);
 }
 
 // static
 WindowPortMus* WindowPortMus::Get(Window* window) {
@@ skipping 165 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);
 }
 
+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);
+}
+
+std::unique_ptr<WindowMusChangeData>
+WindowPortMus::PrepareForServerVisibilityChange(bool value) {
+  std::unique_ptr<WindowMusChangeDataImpl> data(
+      base::MakeUnique<WindowMusChangeDataImpl>());
+  ServerChangeData change_data;
+  change_data.visible = value;
+  data->change = base::MakeUnique<ScopedServerChange>(
+      this, ServerChangeType::VISIBLE, change_data);
+  return std::move(data);
+}
+
 void WindowPortMus::NotifyEmbeddedAppDisconnected() {
   for (WindowObserver& observer : *GetObservers(window_))
     observer.OnEmbeddedAppDisconnected(window_);
 }
 
 std::unique_ptr<WindowPortInitData> WindowPortMus::OnPreInit(Window* window) {
   window_ = window;
   return window_tree_client_->OnWindowMusCreated(this);
 }
 
@@ skipping 72 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