Restructure public side of view_manager service.

mojo/services/view_manager/public/cpp/view_property.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_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"
 
 // This header should be included by code that defines ViewProperties. It
 // should not be included by code that only gets and sets ViewProperties.
 //
 // 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 {
 //    // Use this to define an exported property that is premitive,
 //    // or a pointer you don't want automatically deleted.
 //    DEFINE_VIEW_PROPERTY_KEY(MyType, kMyKey, MyDefault);
 //
 //    // Use this to define an exported property whose value is a heap
 //    // allocated object, and has to be owned and freed by the view.
 //    DEFINE_OWNED_VIEW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);
@@ skipping 104 matching lines @@
   void Deallocator##NAME(int64 p) {                                    \
     enum { type_must_be_complete = sizeof(TYPE) };                     \
     delete mojo::ViewPropertyCaster<TYPE*>::FromInt64(p);              \
   }                                                                    \
   const mojo::ViewProperty<TYPE*> NAME##_Value = {DEFAULT,             \
                                                   #NAME,               \
                                                   &Deallocator##NAME}; \
   }                                                                    \
   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_