components/mus/public/interfaces View => Window

components/mus/ws/ids.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_IDS_H_
 #define COMPONENTS_MUS_WS_IDS_H_
 
 #include "components/mus/public/cpp/types.h"
 #include "components/mus/public/cpp/util.h"
 
 namespace mus {
 
 // Connection id is used to indicate no connection. That is, no ViewTreeImpl
 // ever gets this id.
 const ConnectionSpecificId kInvalidConnectionId = 0;
 
 // Adds a bit of type safety to view ids.
 struct ViewId {
-  ViewId(ConnectionSpecificId connection_id, ConnectionSpecificId view_id)
-      : connection_id(connection_id), view_id(view_id) {}
-  ViewId() : connection_id(0), view_id(0) {}
+  ViewId(ConnectionSpecificId connection_id, ConnectionSpecificId window_id)
+      : connection_id(connection_id), window_id(window_id) {}
+  ViewId() : connection_id(0), window_id(0) {}
 
   bool operator==(const ViewId& other) const {
-    return other.connection_id == connection_id && other.view_id == view_id;
+    return other.connection_id == connection_id && other.window_id == window_id;
   }
 
   bool operator!=(const ViewId& other) const { return !(*this == other); }
 
   bool operator<(const ViewId& other) const {
     if (connection_id == other.connection_id)
-      return view_id < other.view_id;
+      return window_id < other.window_id;
 
     return connection_id < other.connection_id;
   }
 
   ConnectionSpecificId connection_id;
-  ConnectionSpecificId view_id;
+  ConnectionSpecificId window_id;
 };
 
 inline ViewId ViewIdFromTransportId(Id id) {
   return ViewId(HiWord(id), LoWord(id));
 }
 
 inline Id ViewIdToTransportId(const ViewId& id) {
-  return (id.connection_id << 16) | id.view_id;
+  return (id.connection_id << 16) | id.window_id;
 }
 
 // Returns a ViewId that is reserved to indicate no view. That is, no view will
 // ever be created with this id.
 inline ViewId InvalidViewId() {
   return ViewId(kInvalidConnectionId, 0);
 }
 
 // Returns a root view id with a given index offset.
 inline ViewId RootViewId(uint16_t index) {
   return ViewId(kInvalidConnectionId, 2 + index);
 }
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_IDS_H_