components/mus/public/interfaces View => Window

components/mus/ws/server_view.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_SERVER_VIEW_H_
 #define COMPONENTS_MUS_WS_SERVER_VIEW_H_
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/server_view_surface.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/platform_window/text_input_state.h"
 
 namespace mus {
 
 class ServerViewDelegate;
@@ skipping 12 matching lines @@
 class ServerView {
  public:
   ServerView(ServerViewDelegate* delegate, const ViewId& id);
   ~ServerView();
 
   void AddObserver(ServerViewObserver* observer);
   void RemoveObserver(ServerViewObserver* observer);
 
   // Binds the provided |request| to |this| object. If an interface is already
   // bound to this ServerView then the old connection is closed first.
-  void Bind(mojo::InterfaceRequest<mojo::Surface> request,
-            mojo::SurfaceClientPtr client);
+  void Bind(mojo::InterfaceRequest<mojom::Surface> request,
+            mojom::SurfaceClientPtr client);
 
   const ViewId& id() const { return id_; }
 
   void Add(ServerView* child);
   void Remove(ServerView* child);
   void Reorder(ServerView* child,
                ServerView* relative,
-               mojo::OrderDirection direction);
+               mojom::OrderDirection direction);
 
   const gfx::Rect& bounds() const { return bounds_; }
   // Sets the bounds. If the size changes this implicitly resets the client
   // area to fill the whole bounds.
   void SetBounds(const gfx::Rect& bounds);
 
   const gfx::Rect& client_area() const { return client_area_; }
   void SetClientArea(const gfx::Rect& bounds);
 
   const ServerView* parent() const { return parent_; }
@@ skipping 73 matching lines @@
   std::map<std::string, std::vector<uint8_t>> properties_;
 
   base::ObserverList<ServerViewObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerView);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_SERVER_VIEW_H_