Client side name cleanup

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/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 // Connection id reserved for the root.
 const ConnectionSpecificId kRootConnection = 0;
 
 // Adds a bit of type safety to node ids.
@@ skipping 61 matching lines @@
 // ever be created with this id.
 inline NodeId InvalidNodeId() {
   return NodeId(kRootConnection, 0);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_IDS_H_