Client side name cleanup

mojo/services/public/cpp/view_manager/types.h

Index: mojo/services/public/cpp/view_manager/types.h
diff --git a/mojo/services/public/cpp/view_manager/view_manager_types.h b/mojo/services/public/cpp/view_manager/types.h
similarity index 77%
rename from mojo/services/public/cpp/view_manager/view_manager_types.h
rename to mojo/services/public/cpp/view_manager/types.h
index 09f48f47716dce6076cfb4bdd211b49dd0346e5f..c1f33f30b8d9547ec64184294324f073f0222168 100644
--- a/mojo/services/public/cpp/view_manager/view_manager_types.h
+++ b/mojo/services/public/cpp/view_manager/types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_TYPES_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_TYPES_H_
+#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_TYPES_H_
+#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_TYPES_H_
 
 #include "base/basictypes.h"
 
@@ -24,4 +24,4 @@ typedef uint16_t ConnectionSpecificId;
 }  // namespace view_manager
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_TYPES_H_
+#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_TYPES_H_