Restructure public side of view_manager service.

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

Index: mojo/services/view_manager/public/cpp/view_property.h
diff --git a/mojo/services/public/cpp/view_manager/view_property.h b/mojo/services/view_manager/public/cpp/view_property.h
similarity index 95%
rename from mojo/services/public/cpp/view_manager/view_property.h
rename to mojo/services/view_manager/public/cpp/view_property.h
index 11e5e498305b6681794bc88d3aa4c8f14173b054..d779ebe4bd4a8085293d0c8a4dbee74cdda06f28 100644
--- a/mojo/services/public/cpp/view_manager/view_property.h
+++ b/mojo/services/view_manager/public/cpp/view_property.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_PROPERTY_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_PROPERTY_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
 
 #include "base/basictypes.h"
 
@@ -12,7 +12,7 @@
 //
 // To define a new ViewProperty:
 //
-//  #include "mojo/services/public/cpp/view_manager/view_property.h"
+//  #include "mojo/services/view_manager/public/cpp/view_property.h"
 //
 //  DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(FOO_EXPORT, MyType);
 //  namespace foo {
@@ -137,4 +137,4 @@ void View::ClearLocalProperty(const ViewProperty<T>* property) {
   }                                                                    \
   const mojo::ViewProperty<TYPE*>* const NAME = &NAME##_Value;
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_PROPERTY_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_