Unify SurfaceInfo

ui/aura/mus/window_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_MUS_H_
 #define UI_AURA_MUS_WINDOW_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/mus/mus_types.h"
 
+namespace cc {
+class SurfaceInfo;
+}
+
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 namespace mojom {
 enum class OrderDirection;
 }
 }
 
 namespace aura {
 
-struct SurfaceInfo;
 class Window;
 class WindowTreeClient;
 
 // See PrepareForServerBoundsChange() for details on this.
 struct AURA_EXPORT WindowMusChangeData {
   virtual ~WindowMusChangeData() {}
 };
 
 // WindowMus defines the interface used by WindowTreeClient to modify
 // the underlying Window. It's defined as a separate interface to make it clear
@@ skipping 32 matching lines @@
   virtual void RemoveChildFromServer(WindowMus* child) = 0;
   virtual void ReorderFromServer(WindowMus* child,
                                  WindowMus* relative,
                                  ui::mojom::OrderDirection) = 0;
   virtual void SetBoundsFromServer(const gfx::Rect& bounds) = 0;
   virtual void SetVisibleFromServer(bool visible) = 0;
   virtual void SetOpacityFromServer(float opacity) = 0;
   virtual void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) = 0;
   virtual void SetPropertyFromServer(const std::string& property_name,
                                      const std::vector<uint8_t>* data) = 0;
-  virtual void SetSurfaceIdFromServer(
-      std::unique_ptr<SurfaceInfo> surface_info) = 0;
+  virtual void SetSurfaceInfoFromServer(
+      const cc::SurfaceInfo& surface_info) = 0;
   // The window was deleted on the server side. DestroyFromServer() should
   // result in deleting |this|.
   virtual void DestroyFromServer() = 0;
   virtual void AddTransientChildFromServer(WindowMus* child) = 0;
   virtual void RemoveTransientChildFromServer(WindowMus* child) = 0;
   // Called when a window was added/removed as a transient child.
   virtual ChangeSource OnTransientChildAdded(WindowMus* child) = 0;
   virtual ChangeSource OnTransientChildRemoved(WindowMus* child) = 0;
 
   // Called in the rare case when WindowTreeClient needs to change state and
@@ skipping 24 matching lines @@
 
   void set_server_id(Id id) { server_id_ = id; }
 
   Id server_id_ = kInvalidServerId;
   const WindowMusType window_mus_type_;
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_MUS_H_