components/mus/public/interfaces View => Window

components/mus/public/cpp/lib/window_tree_client_impl.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 COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
 
 #include "components/mus/public/cpp/types.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace mus {
 class WindowTreeConnection;
 class WindowTreeDelegate;
 
 // Manages the connection with the Window Server service.
 class WindowTreeClientImpl : public WindowTreeConnection,
-                             public mojo::ViewTreeClient {
+                             public mus::mojom::WindowTreeClient {
  public:
-  WindowTreeClientImpl(WindowTreeDelegate* delegate,
-                       mojo::InterfaceRequest<mojo::ViewTreeClient> request);
+  WindowTreeClientImpl(
+      WindowTreeDelegate* delegate,
+      mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request);
   ~WindowTreeClientImpl() override;
 
   // Wait for OnEmbed(), returning when done.
   void WaitForEmbed();
 
   bool connected() const { return tree_; }
   ConnectionSpecificId connection_id() const { return connection_id_; }
 
   // API exposed to the window implementations that pushes local changes to the
   // service.
   void DestroyWindow(Id window_id);
 
   // These methods take TransportIds. For windows owned by the current
   // connection,
   // the connection id high word can be zero. In all cases, the TransportId 0x1
   // refers to the root window.
   void AddChild(Id child_id, Id parent_id);
   void RemoveChild(Id child_id, Id parent_id);
 
   void Reorder(Id window_id,
                Id relative_window_id,
-               mojo::OrderDirection direction);
+               mojom::OrderDirection direction);
 
   // Returns true if the specified window was created by this connection.
   bool OwnsWindow(Id id) const;
 
   void SetBounds(Id window_id, const mojo::Rect& bounds);
   void SetClientArea(Id window_id, const mojo::Rect& client_area);
   void SetFocus(Id window_id);
   void SetVisible(Id window_id, bool visible);
   void SetProperty(Id window_id,
                    const std::string& name,
                    const std::vector<uint8_t>& data);
-  void SetViewTextInputState(Id window_id, mojo::TextInputStatePtr state);
+  void SetWindowTextInputState(Id window_id, mojo::TextInputStatePtr state);
   void SetImeVisibility(Id window_id,
                         bool visible,
                         mojo::TextInputStatePtr state);
 
   void Embed(Id window_id,
-             mojo::ViewTreeClientPtr client,
+             mus::mojom::WindowTreeClientPtr client,
              uint32_t policy_bitmask,
-             const mojo::ViewTree::EmbedCallback& callback);
+             const mus::mojom::WindowTree::EmbedCallback& callback);
 
   void RequestSurface(Id window_id,
-                      mojo::InterfaceRequest<mojo::Surface> surface,
-                      mojo::SurfaceClientPtr client);
+                      mojo::InterfaceRequest<mojom::Surface> surface,
+                      mojom::SurfaceClientPtr client);
 
   void set_change_acked_callback(const mojo::Callback<void(void)>& callback) {
     change_acked_callback_ = callback;
   }
   void ClearChangeAckedCallback() { change_acked_callback_.reset(); }
 
   // Start/stop tracking views. While tracked, they can be retrieved via
   // WindowTreeConnection::GetWindowById.
   void AddWindow(Window* window);
   void RemoveWindow(Id window_id);
@@ skipping 11 matching lines @@
   Id CreateWindowOnServer();
 
   // Overridden from WindowTreeConnection:
   Window* GetRoot() override;
   Window* GetWindowById(Id id) override;
   Window* GetFocusedWindow() override;
   Window* CreateWindow() override;
   bool IsEmbedRoot() override;
   ConnectionSpecificId GetConnectionId() override;
 
-  // Overridden from ViewTreeClient:
+  // Overridden from WindowTreeClient:
   void OnEmbed(ConnectionSpecificId connection_id,
-               mojo::ViewDataPtr root,
-               mojo::ViewTreePtr tree,
+               mojom::WindowDataPtr root,
+               mojom::WindowTreePtr tree,
                Id focused_window_id,
                uint32_t access_policy) override;
   void OnEmbeddedAppDisconnected(Id window_id) override;
   void OnUnembed() override;
   void OnWindowBoundsChanged(Id window_id,
                              mojo::RectPtr old_bounds,
                              mojo::RectPtr new_bounds) override;
   void OnClientAreaChanged(uint32_t window_id,
                            mojo::RectPtr old_client_area,
                            mojo::RectPtr new_client_area) override;
   void OnWindowViewportMetricsChanged(
-      mojo::ViewportMetricsPtr old_metrics,
-      mojo::ViewportMetricsPtr new_metrics) override;
+      mojom::ViewportMetricsPtr old_metrics,
+      mojom::ViewportMetricsPtr new_metrics) override;
   void OnWindowHierarchyChanged(
       Id window_id,
       Id new_parent_id,
       Id old_parent_id,
-      mojo::Array<mojo::ViewDataPtr> windows) override;
+      mojo::Array<mojom::WindowDataPtr> windows) override;
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
-                         mojo::OrderDirection direction) override;
+                         mojom::OrderDirection direction) override;
   void OnWindowDeleted(Id window_id) override;
   void OnWindowVisibilityChanged(Id window_id, bool visible) override;
   void OnWindowDrawnStateChanged(Id window_id, bool drawn) override;
   void OnWindowSharedPropertyChanged(Id window_id,
                                      const mojo::String& name,
                                      mojo::Array<uint8_t> new_data) override;
   void OnWindowInputEvent(Id window_id,
                           mojo::EventPtr event,
                           const mojo::Callback<void()>& callback) override;
   void OnWindowFocused(Id focused_window_id) override;
@@ skipping 12 matching lines @@
   WindowTreeDelegate* delegate_;
 
   Window* root_;
 
   IdToWindowMap windows_;
 
   Window* capture_window_;
   Window* focused_window_;
   Window* activated_window_;
 
-  mojo::Binding<ViewTreeClient> binding_;
-  mojo::ViewTreePtr tree_;
+  mojo::Binding<WindowTreeClient> binding_;
+  mus::mojom::WindowTreePtr tree_;
 
   bool is_embed_root_;
 
   bool in_destructor_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_