| Index: mojo/services/view_manager/cpp/view_property.h
|
| diff --git a/mojo/services/view_manager/public/cpp/view_property.h b/mojo/services/view_manager/cpp/view_property.h
|
| similarity index 93%
|
| rename from mojo/services/view_manager/public/cpp/view_property.h
|
| rename to mojo/services/view_manager/cpp/view_property.h
|
| index 2dbd317b8cd3bf8a36967098222d45eb917b09ea..312b9bb100b0fb936f9636c5c6bf3a6e5798943e 100644
|
| --- a/mojo/services/view_manager/public/cpp/view_property.h
|
| +++ b/mojo/services/view_manager/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_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
|
| -#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
|
| +#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
|
| +#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -12,7 +12,7 @@
|
| //
|
| // To define a new ViewProperty:
|
| //
|
| -// #include "view_manager/public/cpp/view_property.h"
|
| +// #include "view_manager/cpp/view_property.h"
|
| //
|
| // DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(FOO_EXPORT, MyType);
|
| // namespace foo {
|
| @@ -131,10 +131,9 @@ void View::ClearLocalProperty(const ViewProperty<T>* property) {
|
| enum { type_must_be_complete = sizeof(TYPE) }; \
|
| delete mojo::ViewPropertyCaster<TYPE*>::FromInt64(p); \
|
| } \
|
| - const mojo::ViewProperty<TYPE*> NAME##_Value = {DEFAULT, \
|
| - #NAME, \
|
| + const mojo::ViewProperty<TYPE*> NAME##_Value = {DEFAULT, #NAME, \
|
| &Deallocator##NAME}; \
|
| } \
|
| const mojo::ViewProperty<TYPE*>* const NAME = &NAME##_Value;
|
|
|
| -#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
|
| +#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
|
|
|