Fixes to WindowTreeHostMus

ui/aura/mus/window_port_mus.h

 // 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.
 
 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 18 matching lines @@
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 
 // WindowPortMus is a WindowPort that forwards calls to WindowTreeClient
 // so that changes are propagated to the server. All changes from
 // WindowTreeClient to the underlying Window route through this class (by
 // way of WindowMus) and are done in such a way that they don't result in
 // calling back to WindowTreeClient.
 class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
  public:
-  WindowPortMus(WindowTreeClient* client);
+  // See WindowMus's constructor for details on |create_remote_window|.
+  explicit WindowPortMus(WindowTreeClient* client,
+                         bool create_remote_window = true);
   ~WindowPortMus() override;
 
   static WindowPortMus* Get(Window* window);
 
   Window* window() { return window_; }
   const Window* window() const { return window_; }
 
   void SetTextInputState(mojo::TextInputStatePtr state);
   void SetImeVisibility(bool visible, mojo::TextInputStatePtr state);
 
@@ skipping 80 matching lines @@
 
     ~ScopedServerChange() { window_impl_->RemoveChangeById(server_change_id_); }
 
    private:
     WindowPortMus* window_impl_;
     const ServerChangeIdType server_change_id_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedServerChange);
   };
 
+  struct WindowMusChangeDataImpl : public WindowMusChangeData {
+    WindowMusChangeDataImpl();
+    ~WindowMusChangeDataImpl() override;
+
+    std::unique_ptr<ScopedServerChange> change;
+  };
+
   // Creates and adds a ServerChange to |server_changes_|. Returns the id
   // assigned to the ServerChange.
   ServerChangeIdType ScheduleChange(const ServerChangeType type,
                                     const ServerChangeData& data);
 
   // Removes a ServerChange by id.
   void RemoveChangeById(ServerChangeIdType change_id);
 
   // If there is a schedule change matching |type| and |data| it is removed and
   // true is returned. If no matching change is scheduled returns false.
@@ skipping 11 matching lines @@
                          ui::mojom::OrderDirection) override;
   void SetBoundsFromServer(const gfx::Rect& bounds) override;
   void SetVisibleFromServer(bool visible) override;
   void SetOpacityFromServer(float opacity) override;
   void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) override;
   void SetPropertyFromServer(
       const std::string& property_name,
       const std::vector<uint8_t>* property_data) override;
   void SetSurfaceIdFromServer(
       std::unique_ptr<SurfaceInfo> surface_info) override;
+  std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
+      const gfx::Rect& bounds) override;
+  std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
+      bool value) override;
   void NotifyEmbeddedAppDisconnected() override;
 
   // WindowPort:
   std::unique_ptr<WindowPortInitData> OnPreInit(Window* window) override;
   void OnPostInit(std::unique_ptr<WindowPortInitData> init_data) override;
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
   void OnWillAddChild(Window* child) override;
   void OnWillRemoveChild(Window* child) override;
   void OnWillMoveChild(size_t current_index, size_t dest_index) override;
   void OnVisibilityChanged(bool visible) override;
   void OnDidChangeBounds(const gfx::Rect& old_bounds,
                          const gfx::Rect& new_bounds) override;
   std::unique_ptr<WindowPortPropertyData> OnWillChangeProperty(
       const void* key) override;
   void OnPropertyChanged(const void* key,
                          std::unique_ptr<WindowPortPropertyData> data) override;
 
   WindowTreeClient* window_tree_client_;
+
   Window* window_ = nullptr;
 
   ServerChangeIdType next_server_change_id_ = 0;
   std::vector<ServerChange> server_changes_;
 
   SurfaceIdHandler* surface_id_handler_;
   std::unique_ptr<SurfaceInfo> surface_info_;
 
   ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_PORT_MUS_H_