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

services/ui/ws/window_tree.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_WS_WINDOW_TREE_H_
 #define SERVICES_UI_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 320 matching lines @@
   void RemoveFromKnown(const ServerWindow* window,
                        std::vector<ServerWindow*>* local_windows);
 
   // Removes a root from set of roots of this tree. This does not remove
   // the window from the window tree, only from the set of roots.
   void RemoveRoot(ServerWindow* window, RemoveRootReason reason);
 
   // Converts Window(s) to WindowData(s) for transport. This assumes all the
   // windows are valid for the client. The parent of windows the client is not
   // allowed to see are set to NULL (in the returned WindowData(s)).
-  mojo::Array<mojom::WindowDataPtr> WindowsToWindowDatas(
+  std::vector<mojom::WindowDataPtr> WindowsToWindowDatas(
       const std::vector<const ServerWindow*>& windows);
   mojom::WindowDataPtr WindowToWindowData(const ServerWindow* window);
 
   // Implementation of GetWindowTree(). Adds |window| to |windows| and recurses
   // if CanDescendIntoWindowForWindowTree() returns true.
   void GetWindowTreeImpl(const ServerWindow* window,
                          std::vector<const ServerWindow*>* windows) const;
 
   // Notify the client if the drawn state of any of the roots changes.
   // |window| is the window that is changing to the drawn state
@@ skipping 17 matching lines @@
   // Returns true if the client has a pointer watcher and this event matches.
   bool EventMatchesPointerWatcher(const ui::Event& event) const;
 
   // Calls OnChangeCompleted() on the client.
   void NotifyChangeCompleted(uint32_t change_id,
                              mojom::WindowManagerErrorCode error_code);
 
   // WindowTree:
   void NewWindow(uint32_t change_id,
                  Id transport_window_id,
-                 mojo::Map<mojo::String, mojo::Array<uint8_t>>
+                 const base::Optional<
+                     std::unordered_map<std::string, std::vector<uint8_t>>>&
                      transport_properties) override;
-  void NewTopLevelWindow(uint32_t change_id,
-                         Id transport_window_id,
-                         mojo::Map<mojo::String, mojo::Array<uint8_t>>
-                             transport_properties) override;
+  void NewTopLevelWindow(
+      uint32_t change_id,
+      Id transport_window_id,
+      const std::unordered_map<std::string, std::vector<uint8_t>>&
+          transport_properties) override;
   void DeleteWindow(uint32_t change_id, Id transport_window_id) override;
   void AddWindow(uint32_t change_id, Id parent_id, Id child_id) override;
   void RemoveWindowFromParent(uint32_t change_id, Id window_id) override;
   void AddTransientWindow(uint32_t change_id,
                           Id window,
                           Id transient_window) override;
   void RemoveTransientWindowFromParent(uint32_t change_id,
                                        Id transient_window_id) override;
   void SetModal(uint32_t change_id, Id window_id) override;
   void ReorderWindow(uint32_t change_Id,
                      Id window_id,
                      Id relative_window_id,
                      mojom::OrderDirection direction) override;
   void GetWindowTree(
       Id window_id,
-      const base::Callback<void(mojo::Array<mojom::WindowDataPtr>)>& callback)
+      const base::Callback<void(std::vector<mojom::WindowDataPtr>)>& callback)
       override;
   void SetCapture(uint32_t change_id, Id window_id) override;
   void ReleaseCapture(uint32_t change_id, Id window_id) override;
   void StartPointerWatcher(bool want_moves) override;
   void StopPointerWatcher() override;
   void SetWindowBounds(uint32_t change_id,
                        Id window_id,
                        const gfx::Rect& bounds) override;
   void SetWindowVisibility(uint32_t change_id,
                            Id window_id,
                            bool visible) override;
-  void SetWindowProperty(uint32_t change_id,
-                         Id transport_window_id,
-                         const mojo::String& name,
-                         mojo::Array<uint8_t> value) override;
+  void SetWindowProperty(
+      uint32_t change_id,
+      Id transport_window_id,
+      const std::string& name,
+      const base::Optional<std::vector<uint8_t>>& value) override;
   void SetWindowOpacity(uint32_t change_id,
                         Id window_id,
                         float opacity) override;
   void AttachCompositorFrameSink(
       Id transport_window_id,
       mojom::CompositorFrameSinkType type,
       cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
   void Embed(Id transport_window_id,
              mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const EmbedCallback& callback) override;
   void SetFocus(uint32_t change_id, Id transport_window_id) override;
   void SetCanFocus(Id transport_window_id, bool can_focus) override;
   void SetCanAcceptEvents(Id transport_window_id,
                           bool can_accept_events) override;
   void SetPredefinedCursor(uint32_t change_id,
                            Id transport_window_id,
                            ui::mojom::Cursor cursor_id) override;
   void SetWindowTextInputState(Id transport_window_id,
                                mojo::TextInputStatePtr state) override;
   void SetImeVisibility(Id transport_window_id,
                         bool visible,
                         mojo::TextInputStatePtr state) override;
   void OnWindowInputEventAck(uint32_t event_id,
                              mojom::EventResult result) override;
-  void SetClientArea(
-      Id transport_window_id,
-      const gfx::Insets& insets,
-      mojo::Array<gfx::Rect> transport_additional_client_areas) override;
+  void SetClientArea(Id transport_window_id,
+                     const gfx::Insets& insets,
+                     const base::Optional<std::vector<gfx::Rect>>&
+                         transport_additional_client_areas) override;
   void SetCanAcceptDrops(Id window_id, bool accepts_drops) override;
   void SetHitTestMask(Id transport_window_id,
                       const base::Optional<gfx::Rect>& mask) override;
   void GetWindowManagerClient(
       mojo::AssociatedInterfaceRequest<mojom::WindowManagerClient> internal)
       override;
   void GetCursorLocationMemory(const GetCursorLocationMemoryCallback& callback)
       override;
-  void PerformDragDrop(uint32_t change_id,
-                       Id source_window_id,
-                       mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
-                       uint32_t drag_operation) override;
+  void PerformDragDrop(
+      uint32_t change_id,
+      Id source_window_id,
+      const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
+      uint32_t drag_operation) override;
   void CancelDragDrop(Id window_id) override;
   void PerformWindowMove(uint32_t change_id,
                          Id window_id,
                          ui::mojom::MoveLoopSource source,
                          const gfx::Point& cursor) override;
   void CancelWindowMove(Id window_id) override;
 
   // mojom::WindowManagerClient:
   void AddAccelerator(uint32_t id,
                       mojom::EventMatcherPtr event_matcher,
@@ skipping 109 matching lines @@
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_TREE_H_