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

services/ui/public/cpp/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 SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 97 matching lines @@
   void ClearHitTestMask(Id window_id);
   void SetFocus(Window* window);
   void SetCanFocus(Id window_id, bool can_focus);
   void SetCanAcceptDrops(Id window_id, bool can_accept_drops);
   void SetCanAcceptEvents(Id window_id, bool can_accept_events);
   void SetPredefinedCursor(Id window_id, ui::mojom::Cursor cursor_id);
   void SetVisible(Window* window, bool visible);
   void SetOpacity(Window* window, float opacity);
   void SetProperty(Window* window,
                    const std::string& name,
-                   mojo::Array<uint8_t> data);
+                   const base::Optional<std::vector<uint8_t>>& data);
   void SetWindowTextInputState(Id window_id, mojo::TextInputStatePtr state);
   void SetImeVisibility(Id window_id,
                         bool visible,
                         mojo::TextInputStatePtr state);
 
   void Embed(Id window_id,
              mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const mojom::WindowTree::EmbedCallback& callback);
 
@@ skipping 111 matching lines @@
   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);
 
   static Id server_id(const Window* window) { return window->server_id(); }
 
-  void BuildWindowTree(const mojo::Array<mojom::WindowDataPtr>& windows,
+  void BuildWindowTree(const std::vector<mojom::WindowDataPtr>& windows,
                        Window* initial_parent);
 
   Window* NewWindowImpl(NewWindowType type,
                         const Window::SharedProperties* properties);
 
   // Sets the mojom::WindowTree implementation.
   void SetWindowTree(mojom::WindowTreePtr window_tree_ptr);
 
   // Called when the mojom::WindowTree connection is lost, deletes this.
   void OnConnectionLost();
@@ skipping 30 matching lines @@
   void OnTopLevelCreated(uint32_t change_id,
                          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<mojom::WindowDataPtr> windows) override;
+      std::vector<mojom::WindowDataPtr> windows) override;
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
                          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> new_data) override;
+  void OnWindowSharedPropertyChanged(
+      Id window_id,
+      const std::string& name,
+      const base::Optional<std::vector<uint8_t>>& new_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,
                                        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,
                          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,
                          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 68 matching lines @@
 
   bool has_pointer_watcher_ = false;
 
   // The current change id for the client.
   uint32_t current_move_loop_change_ = 0u;
 
   // Callback executed when a move loop initiated by PerformWindowMove() is
   // completed.
   base::Callback<void(bool)> on_current_move_finished_;
 
-  // The current change id for the window manager.
+  // The current change id for the window manager.gg
   uint32_t current_wm_move_loop_change_ = 0u;
   Id current_wm_move_loop_window_id_ = 0u;
 
   // State related to being the initiator of a drag started with
   // PerformDragDrop().
   std::unique_ptr<CurrentDragState> current_drag_state_;
 
   // The mus server sends the mime drag data once per connection; we cache this
   // and are responsible for sending it to all of our windows.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_drag_data_;
+
+  std::map<std::string, std::vector<uint8_t>> mime_drag_data_;
 
   // A set of window ids for windows that we received an OnDragEnter() message
   // for. We maintain this set so we know who to send OnDragFinish() messages
   // at the end of the drag.
   std::set<Id> drag_entered_windows_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_