components/mus/public/interfaces View => Window

components/mus/ws/connection_manager.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_WS_CONNECTION_MANAGER_H_
 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
-#include "components/mus/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/focus_controller_delegate.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/server_view_delegate.h"
 #include "components/mus/ws/server_view_observer.h"
 #include "components/mus/ws/view_tree_host_impl.h"
 #include "mojo/converters/surfaces/custom_surface_converter.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
@@ skipping 68 matching lines @@
 
   // See description of ViewTree::Embed() for details. This assumes
   // |transport_view_id| is valid.
   void EmbedAtView(ConnectionSpecificId creator_id,
                    const ViewId& view_id,
                    uint32_t policy_bitmask,
                    mojo::URLRequestPtr request);
   ViewTreeImpl* EmbedAtView(ConnectionSpecificId creator_id,
                             const ViewId& view_id,
                             uint32_t policy_bitmask,
-                            mojo::ViewTreeClientPtr client);
+                            mojom::WindowTreeClientPtr client);
 
   // Returns the connection by id.
   ViewTreeImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the View identified by |id|.
   ServerView* GetView(const ViewId& id);
 
   // Returns whether |view| is a descendant of some root view but not itself a
   // root view.
   bool IsViewAttachedToRoot(const ServerView* view) const;
@@ skipping 11 matching lines @@
   void OnDisplayClosed();
 
   // Invoked when a connection messages a client about the change. This is used
   // to avoid sending ServerChangeIdAdvanced() unnecessarily.
   void OnConnectionMessagedClient(ConnectionSpecificId id);
 
   // Returns true if OnConnectionMessagedClient() was invoked for id.
   bool DidConnectionMessageClient(ConnectionSpecificId id) const;
 
   // Returns the metrics of the viewport where the provided |view| is displayed.
-  mojo::ViewportMetricsPtr GetViewportMetricsForView(const ServerView* view);
+  mojom::ViewportMetricsPtr GetViewportMetricsForView(const ServerView* view);
 
   // Returns the ViewTreeImpl that has |id| as a root.
   ViewTreeImpl* GetConnectionWithRoot(const ViewId& id) {
     return const_cast<ViewTreeImpl*>(
         const_cast<const ConnectionManager*>(this)->GetConnectionWithRoot(id));
   }
   const ViewTreeImpl* GetConnectionWithRoot(const ViewId& id) const;
 
-  ViewTreeHostImpl* GetViewTreeHostByView(const ServerView* view);
-  const ViewTreeHostImpl* GetViewTreeHostByView(const ServerView* view) const;
+  ViewTreeHostImpl* GetWindowTreeHostByView(const ServerView* view);
+  const ViewTreeHostImpl* GetWindowTreeHostByView(const ServerView* view) const;
 
   // Returns the first ancestor of |service| that is marked as an embed root.
   ViewTreeImpl* GetEmbedRoot(ViewTreeImpl* service);
 
   // ViewTreeHost implementation helper; see mojom for details.
   bool CloneAndAnimate(const ViewId& view_id);
 
   // These functions trivially delegate to all ViewTreeImpls, which in
   // term notify their clients.
   void ProcessViewDestroyed(ServerView* view);
   void ProcessViewBoundsChanged(const ServerView* view,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessClientAreaChanged(const ServerView* window,
                                 const gfx::Rect& old_client_area,
                                 const gfx::Rect& new_client_area);
-  void ProcessViewportMetricsChanged(const mojo::ViewportMetrics& old_metrics,
-                                     const mojo::ViewportMetrics& new_metrics);
+  void ProcessViewportMetricsChanged(const mojom::ViewportMetrics& old_metrics,
+                                     const mojom::ViewportMetrics& new_metrics);
   void ProcessWillChangeViewHierarchy(const ServerView* view,
                                       const ServerView* new_parent,
                                       const ServerView* old_parent);
   void ProcessViewHierarchyChanged(const ServerView* view,
                                    const ServerView* new_parent,
                                    const ServerView* old_parent);
   void ProcessViewReorder(const ServerView* view,
                           const ServerView* relative_view,
-                          const mojo::OrderDirection direction);
+                          const mojom::OrderDirection direction);
   void ProcessViewDeleted(const ViewId& view);
 
  private:
   using ConnectionMap = std::map<ConnectionSpecificId, ClientConnection*>;
   using HostConnectionMap =
       std::map<ViewTreeHostImpl*, ViewTreeHostConnection*>;
 
   // Invoked when a connection is about to make a change.  Subsequently followed
   // by FinishChange() once the change is done.
   //
@@ skipping 27 matching lines @@
                               ServerView* new_parent,
                               ServerView* old_parent) override;
   void OnViewBoundsChanged(ServerView* view,
                            const gfx::Rect& old_bounds,
                            const gfx::Rect& new_bounds) override;
   void OnWindowClientAreaChanged(ServerView* window,
                                  const gfx::Rect& old_client_area,
                                  const gfx::Rect& new_client_area) override;
   void OnViewReordered(ServerView* view,
                        ServerView* relative,
-                       mojo::OrderDirection direction) override;
+                       mojom::OrderDirection direction) override;
   void OnWillChangeViewVisibility(ServerView* view) override;
   void OnViewSharedPropertyChanged(
       ServerView* view,
       const std::string& name,
       const std::vector<uint8_t>* new_data) override;
   void OnViewTextInputStateChanged(ServerView* view,
                                    const ui::TextInputState& state) override;
 
   ConnectionManagerDelegate* delegate_;
 
@@ skipping 17 matching lines @@
   ScopedChange* current_change_;
 
   bool in_destructor_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_