Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types.

ui/aura/mus/window_tree_client.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 UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 170 matching lines @@
 
   // See InFlightChange for details on how InFlightChanges are used.
   uint32_t ScheduleInFlightChange(std::unique_ptr<InFlightChange> change);
 
   // Returns true if there is an InFlightChange that matches |change|. If there
   // is an existing change SetRevertValueFrom() is invoked on it. Returns false
   // if there is no InFlightChange matching |change|.
   // See InFlightChange for details on how InFlightChanges are used.
   bool ApplyServerChangeToExistingInFlightChange(const InFlightChange& change);
 
-  void BuildWindowTree(const mojo::Array<ui::mojom::WindowDataPtr>& windows);
+  void BuildWindowTree(const std::vector<ui::mojom::WindowDataPtr>& windows);
 
   // Creates a WindowPortMus from the server side data.
   std::unique_ptr<WindowPortMus> CreateWindowPortMus(
       const ui::mojom::WindowDataPtr& window_data,
       WindowMusType window_mus_type);
 
   // Sets local properties on the associated Window from the server properties.
   void SetLocalPropertiesFromServerProperties(
       WindowMus* window,
       const ui::mojom::WindowDataPtr& window_data);
@@ skipping 86 matching lines @@
   void OnTopLevelCreated(uint32_t change_id,
                          ui::mojom::WindowDataPtr data,
                          int64_t display_id,
                          bool drawn) override;
   void OnWindowBoundsChanged(Id window_id,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   void OnClientAreaChanged(
       uint32_t window_id,
       const gfx::Insets& new_client_area,
-      mojo::Array<gfx::Rect> new_additional_client_areas) override;
+      const std::vector<gfx::Rect>& new_additional_client_areas) override;
   void OnTransientWindowAdded(uint32_t window_id,
                               uint32_t transient_window_id) override;
   void OnTransientWindowRemoved(uint32_t window_id,
                                 uint32_t transient_window_id) override;
   void OnWindowHierarchyChanged(
       Id window_id,
       Id old_parent_id,
       Id new_parent_id,
-      mojo::Array<ui::mojom::WindowDataPtr> windows) override;
+      std::vector<ui::mojom::WindowDataPtr> windows) override;
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
                          ui::mojom::OrderDirection direction) override;
   void OnWindowDeleted(Id window_id) override;
   void OnWindowVisibilityChanged(Id window_id, bool visible) override;
   void OnWindowOpacityChanged(Id window_id,
                               float old_opacity,
                               float new_opacity) override;
   void OnWindowParentDrawnStateChanged(Id window_id, bool drawn) override;
   void OnWindowSharedPropertyChanged(
       Id window_id,
-      const mojo::String& name,
-      mojo::Array<uint8_t> transport_data) override;
+      const std::string& name,
+      const base::Optional<std::vector<uint8_t>>& transport_data) override;
   void OnWindowInputEvent(uint32_t event_id,
                           Id window_id,
                           std::unique_ptr<ui::Event> event,
                           bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
                               uint32_t window_id) override;
   void OnWindowFocused(Id focused_window_id) override;
   void OnWindowPredefinedCursorChanged(Id window_id,
                                        ui::mojom::Cursor cursor) override;
   void OnWindowSurfaceChanged(Id window_id,
                               const cc::SurfaceId& surface_id,
                               const gfx::Size& frame_size,
                               float device_scale_factor) override;
   void OnDragDropStart(
-      mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override;
+      const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data)
+      override;
   void OnDragEnter(Id window_id,
                    uint32_t event_flags,
                    const gfx::Point& position,
                    uint32_t effect_bitmask,
                    const OnDragEnterCallback& callback) override;
   void OnDragOver(Id window_id,
                   uint32_t event_flags,
                   const gfx::Point& position,
                   uint32_t effect_bitmask,
                   const OnDragOverCallback& callback) override;
@@ skipping 15 matching lines @@
   // Overridden from WindowManager:
   void OnConnect(ClientSpecificId client_id) override;
   void WmNewDisplayAdded(const display::Display& display,
                          ui::mojom::WindowDataPtr root_data,
                          bool parent_drawn) override;
   void WmDisplayRemoved(int64_t display_id) override;
   void WmDisplayModified(const display::Display& display) override;
   void WmSetBounds(uint32_t change_id,
                    Id window_id,
                    const gfx::Rect& transit_bounds) override;
-  void WmSetProperty(uint32_t change_id,
-                     Id window_id,
-                     const mojo::String& name,
-                     mojo::Array<uint8_t> transit_data) override;
-  void WmCreateTopLevelWindow(uint32_t change_id,
-                              ClientSpecificId requesting_client_id,
-                              mojo::Map<mojo::String, mojo::Array<uint8_t>>
-                                  transport_properties) override;
+  void WmSetProperty(
+      uint32_t change_id,
+      Id window_id,
+      const std::string& name,
+      const base::Optional<std::vector<uint8_t>>& transit_data) override;
+  void WmCreateTopLevelWindow(
+      uint32_t change_id,
+      ClientSpecificId requesting_client_id,
+      const std::unordered_map<std::string, std::vector<uint8_t>>&
+          transport_properties) override;
   void WmClientJankinessChanged(ClientSpecificId client_id,
                                 bool janky) override;
   void WmPerformMoveLoop(uint32_t change_id,
                          Id window_id,
                          ui::mojom::MoveLoopSource source,
                          const gfx::Point& cursor_location) override;
   void WmCancelMoveLoop(uint32_t window_id) override;
   void OnAccelerator(uint32_t ack_id,
                      uint32_t accelerator_id,
                      std::unique_ptr<ui::Event> event) override;
@@ skipping 103 matching lines @@
   std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_