components/mus/public/interfaces View => Window

components/mus/ws/server_view.cc

 // 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.
 
 #include "components/mus/ws/server_view.h"
 
 #include <inttypes.h>
 
 #include "base/strings/stringprintf.h"
 #include "components/mus/ws/server_view_delegate.h"
@@ skipping 28 matching lines @@
 }
 
 void ServerView::AddObserver(ServerViewObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ServerView::RemoveObserver(ServerViewObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void ServerView::Bind(mojo::InterfaceRequest<mojo::Surface> request,
-                      mojo::SurfaceClientPtr client) {
+void ServerView::Bind(mojo::InterfaceRequest<mojom::Surface> request,
+                      mojom::SurfaceClientPtr client) {
   GetOrCreateSurface()->Bind(request.Pass(), client.Pass());
 }
 
 void ServerView::Add(ServerView* child) {
   // We assume validation checks happened already.
   DCHECK(child);
   DCHECK(child != this);
   DCHECK(!child->Contains(this));
   if (child->parent() == this) {
     if (children_.size() == 1)
       return;  // Already in the right position.
-    Reorder(child, children_.back(), mojo::ORDER_DIRECTION_ABOVE);
+    Reorder(child, children_.back(), mojom::ORDER_DIRECTION_ABOVE);
     return;
   }
 
   ServerView* old_parent = child->parent();
   FOR_EACH_OBSERVER(ServerViewObserver, child->observers_,
                     OnWillChangeViewHierarchy(child, this, old_parent));
 
   if (child->parent())
     child->parent()->RemoveImpl(child);
 
@@ skipping 11 matching lines @@
 
   FOR_EACH_OBSERVER(ServerViewObserver, child->observers_,
                     OnWillChangeViewHierarchy(child, nullptr, this));
   RemoveImpl(child);
   FOR_EACH_OBSERVER(ServerViewObserver, child->observers_,
                     OnViewHierarchyChanged(child, nullptr, this));
 }
 
 void ServerView::Reorder(ServerView* child,
                          ServerView* relative,
-                         mojo::OrderDirection direction) {
+                         mojom::OrderDirection direction) {
   // We assume validation checks happened else where.
   DCHECK(child);
   DCHECK(child->parent() == this);
   DCHECK_GT(children_.size(), 1u);
   children_.erase(std::find(children_.begin(), children_.end(), child));
   Views::iterator i = std::find(children_.begin(), children_.end(), relative);
-  if (direction == mojo::ORDER_DIRECTION_ABOVE) {
+  if (direction == mojom::ORDER_DIRECTION_ABOVE) {
     DCHECK(i != children_.end());
     children_.insert(++i, child);
-  } else if (direction == mojo::ORDER_DIRECTION_BELOW) {
+  } else if (direction == mojom::ORDER_DIRECTION_BELOW) {
     DCHECK(i != children_.end());
     children_.insert(i, child);
   }
   FOR_EACH_OBSERVER(ServerViewObserver, observers_,
                     OnViewReordered(this, relative, direction));
 }
 
 void ServerView::SetBounds(const gfx::Rect& bounds) {
   if (bounds_ == bounds)
     return;
@@ skipping 30 matching lines @@
   for (size_t i = 0; i < children_.size(); ++i)
     children.push_back(children_[i]);
   return children;
 }
 
 std::vector<ServerView*> ServerView::GetChildren() {
   // TODO(sky): rename to children() and fix return type.
   return children_;
 }
 
-ServerView* ServerView::GetChildView(const ViewId& view_id) {
-  if (id_ == view_id)
+ServerView* ServerView::GetChildView(const ViewId& window_id) {
+  if (id_ == window_id)
     return this;
 
   for (ServerView* child : children_) {
-    ServerView* view = child->GetChildView(view_id);
+    ServerView* view = child->GetChildView(window_id);
     if (view)
       return view;
   }
 
   return nullptr;
 }
 
 bool ServerView::Contains(const ServerView* view) const {
   for (const ServerView* parent = view; parent; parent = parent->parent_) {
     if (parent == this)
@@ skipping 81 matching lines @@
 std::string ServerView::GetDebugWindowHierarchy() const {
   std::string result;
   BuildDebugInfo(std::string(), &result);
   return result;
 }
 
 void ServerView::BuildDebugInfo(const std::string& depth,
                                 std::string* result) const {
   *result += base::StringPrintf(
       "%sid=%d,%d visible=%s bounds=%d,%d %dx%d" PRIu64 "\n", depth.c_str(),
-      static_cast<int>(id_.connection_id), static_cast<int>(id_.view_id),
+      static_cast<int>(id_.connection_id), static_cast<int>(id_.window_id),
       visible_ ? "true" : "false", bounds_.x(), bounds_.y(), bounds_.width(),
       bounds_.height());
   for (const ServerView* child : children_)
     child->BuildDebugInfo(depth + "  ", result);
 }
 #endif
 
 void ServerView::RemoveImpl(ServerView* view) {
   view->parent_ = NULL;
   children_.erase(std::find(children_.begin(), children_.end(), view));
 }
 
 }  // namespace mus