Unify SurfaceInfo

services/ui/public/cpp/window.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "cc/surfaces/surface_info.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ skipping 288 matching lines @@
   void LocalSetClientArea(
       const gfx::Insets& new_client_area,
       const std::vector<gfx::Rect>& additional_client_areas);
   void LocalSetParentDrawn(bool drawn);
   void LocalSetDisplay(int64_t display_id);
   void LocalSetVisible(bool visible);
   void LocalSetOpacity(float opacity);
   void LocalSetPredefinedCursor(mojom::Cursor cursor_id);
   void LocalSetSharedProperty(const std::string& name,
                               const std::vector<uint8_t>* data);
-  void LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info);
+  void LocalSetSurfaceInfo(const cc::SurfaceInfo& surface_info);
 
   // Notifies this winodw that its stacking position has changed.
   void NotifyWindowStackingChanged();
   // Methods implementing visibility change notifications. See WindowObserver
   // for more details.
   void NotifyWindowVisibilityChanged(Window* target, bool visible);
   // Notifies this window's observers. Returns false if |this| was deleted
   // during the call (by an observer), otherwise true.
   bool NotifyWindowVisibilityChangedAtReceiver(Window* target, bool visible);
   // Notifies this window and its child hierarchy. Returns false if |this| was
@@ skipping 65 matching lines @@
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
   struct Value {
     const char* name;
     int64_t value;
     PropertyDeallocator deallocator;
   };
 
   std::map<const void*, Value> prop_map_;
 
-  std::unique_ptr<SurfaceInfo> surface_info_;
+  cc::SurfaceInfo surface_info_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_H_