components/mus/public/interfaces View => Window

components/mus/public/cpp/window.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_VIEW_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_VIEW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "components/mus/public/cpp/types.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/surface_id.mojom.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 
 namespace mus {
 
 class ServiceProviderImpl;
 class WindowObserver;
 class WindowSurface;
@@ skipping 32 matching lines @@
   const mojo::Rect& bounds() const { return bounds_; }
   void SetBounds(const mojo::Rect& bounds);
 
   const mojo::Rect& client_area() const { return client_area_; }
   void SetClientArea(const mojo::Rect& client_area);
 
   // Visibility (also see IsDrawn()). When created windows are hidden.
   bool visible() const { return visible_; }
   void SetVisible(bool value);
 
-  const mojo::ViewportMetrics& viewport_metrics() { return *viewport_metrics_; }
+  const mojom::ViewportMetrics& viewport_metrics() {
+    return *viewport_metrics_;
+  }
 
   scoped_ptr<WindowSurface> RequestSurface();
 
   // Returns the set of string to bag of byte properties. These properties are
   // shared with the window manager.
   const SharedProperties& shared_properties() const { return properties_; }
   // Sets a property. If |data| is null, this property is deleted.
   void SetSharedProperty(const std::string& name,
                          const std::vector<uint8_t>* data);
 
@@ skipping 37 matching lines @@
   const Window* parent() const { return parent_; }
   const Children& children() const { return children_; }
   Window* GetRoot() {
     return const_cast<Window*>(const_cast<const Window*>(this)->GetRoot());
   }
   const Window* GetRoot() const;
 
   void AddChild(Window* child);
   void RemoveChild(Window* child);
 
-  void Reorder(Window* relative, mojo::OrderDirection direction);
+  void Reorder(Window* relative, mojom::OrderDirection direction);
   void MoveToFront();
   void MoveToBack();
 
   bool Contains(Window* child) const;
 
   Window* GetChildById(Id id);
 
   void SetTextInputState(mojo::TextInputStatePtr state);
   void SetImeVisibility(bool visible, mojo::TextInputStatePtr state);
 
   // Focus.
   void SetFocus();
   bool HasFocus() const;
 
-  // Embedding. See view_tree.mojom for details.
-  void Embed(mojo::ViewTreeClientPtr client);
+  // Embedding. See window_tree.mojom for details.
+  void Embed(mus::mojom::WindowTreeClientPtr client);
 
   // NOTE: callback is run synchronously if Embed() is not allowed on this
   // Window.
-  void Embed(mojo::ViewTreeClientPtr client,
+  void Embed(mus::mojom::WindowTreeClientPtr client,
              uint32_t policy_bitmask,
              const EmbedCallback& callback);
 
  protected:
   // This class is subclassed only by test classes that provide a public ctor.
   Window();
   ~Window();
 
  private:
   friend class WindowPrivate;
   friend class WindowTreeClientImpl;
 
   Window(WindowTreeConnection* connection, Id id);
 
   // Called by the public {Set,Get,Clear}Property functions.
   int64_t SetLocalPropertyInternal(const void* key,
                                    const char* name,
                                    PropertyDeallocator deallocator,
                                    int64_t value,
                                    int64_t default_value);
   int64_t GetLocalPropertyInternal(const void* key,
                                    int64_t default_value) const;
 
   void LocalDestroy();
   void LocalAddChild(Window* child);
   void LocalRemoveChild(Window* child);
   // Returns true if the order actually changed.
-  bool LocalReorder(Window* relative, mojo::OrderDirection direction);
+  bool LocalReorder(Window* relative, mojom::OrderDirection direction);
   void LocalSetBounds(const mojo::Rect& old_bounds,
                       const mojo::Rect& new_bounds);
   void LocalSetClientArea(const mojo::Rect& new_client_area);
-  void LocalSetViewportMetrics(const mojo::ViewportMetrics& old_metrics,
-                               const mojo::ViewportMetrics& new_metrics);
+  void LocalSetViewportMetrics(const mojom::ViewportMetrics& old_metrics,
+                               const mojom::ViewportMetrics& new_metrics);
   void LocalSetDrawn(bool drawn);
   void LocalSetVisible(bool visible);
 
   // Methods implementing visibility change notifications. See WindowObserver
   // for more details.
   void NotifyWindowVisibilityChanged(Window* target);
   // Notifies this view's observers. Returns false if |this| was deleted during
   // the call (by an observer), otherwise true.
   bool NotifyWindowVisibilityChangedAtReceiver(Window* target);
   // Notifies this view and its child hierarchy. Returns false if |this| was
   // deleted during the call (by an observer), otherwise true.
   bool NotifyWindowVisibilityChangedDown(Window* target);
   // Notifies this view and its parent hierarchy.
   void NotifyWindowVisibilityChangedUp(Window* target);
 
   // Returns true if embed is allowed for this node. If embedding is allowed all
   // the children are removed.
   bool PrepareForEmbed();
 
   WindowTreeConnection* connection_;
   Id id_;
   Window* parent_;
   Children children_;
 
   base::ObserverList<WindowObserver> observers_;
 
   mojo::Rect bounds_;
   mojo::Rect client_area_;
 
-  mojo::ViewportMetricsPtr viewport_metrics_;
+  mojom::ViewportMetricsPtr viewport_metrics_;
 
   bool visible_;
 
   SharedProperties properties_;
 
   // Drawn state is derived from the visible state and the parent's visible
   // state. This field is only used if the view has no parent (eg it's a root).
   bool drawn_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
   struct Value {
     const char* name;
     int64_t value;
     PropertyDeallocator deallocator;
   };
 
   std::map<const void*, Value> prop_map_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_VIEW_H_