Cleans up usage of ViewManagerServiceImpl::roots_

mojo/services/view_manager/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 MOJO_SERVICES_VIEW_MANAGER_IDS_H_
 #define MOJO_SERVICES_VIEW_MANAGER_IDS_H_
 
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 namespace service {
 
-// Connection id reserved for the root.
-const ConnectionSpecificId kRootConnection = 0;
+// Connection id used to indicate no connection. That is, no

[Ben Goodger (Google), 2014/07/26 16:49:10]

Connection id is used to

[sky, 2014/07/26 20:46:23]

Done.

+// ViewManagerServiceImpl ever gets this id.
+const ConnectionSpecificId kInvalidConnectionId = 0;
 
 // TODO(sky): remove this, temporary while window manager API is in existing
 // api.
 const ConnectionSpecificId kWindowManagerConnection = 1;
 
 // Adds a bit of type safety to node ids.
 struct MOJO_VIEW_MANAGER_EXPORT NodeId {
   NodeId(ConnectionSpecificId connection_id, ConnectionSpecificId node_id)
       : connection_id(connection_id),
         node_id(node_id) {}
@@ skipping 43 matching lines @@
 
 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;
 }
 
 inline NodeId RootNodeId() {
-  return NodeId(kRootConnection, 1);
+  return NodeId(kInvalidConnectionId, 1);
 }
 
 // Returns a NodeId that is reserved to indicate no node. That is, no node will
 // ever be created with this id.
 inline NodeId InvalidNodeId() {
-  return NodeId(kRootConnection, 0);
+  return NodeId(kInvalidConnectionId, 0);
 }
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_IDS_H_