Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: components/mus/public/cpp/view_property.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/public/cpp/view_observer.h ('k') | components/mus/public/cpp/view_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/view_property.h
diff --git a/components/mus/public/cpp/view_property.h b/components/mus/public/cpp/view_property.h
index ccebb7c29d9897e66db80392ddeb7f653192a914..fee92e7654b7a0118eeb91b14aac3486ca3b6047 100644
--- a/components/mus/public/cpp/view_property.h
+++ b/components/mus/public/cpp/view_property.h
@@ -40,7 +40,7 @@
// If a property type is not exported, use DECLARE_VIEW_PROPERTY_TYPE(MyType)
// which is a shorthand for DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(, MyType).
-namespace mus {
+namespace mojo {
namespace {
// No single new-style cast works for every conversion to/from int64_t, so we
@@ -99,41 +99,41 @@
SetLocalProperty(property, property->default_value);
}
-} // namespace mus
+} // namespace mojo
// Macros to instantiate the property getter/setter template functions.
-#define DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(EXPORT, T) \
- template EXPORT void mus::View::SetLocalProperty( \
- const mus::ViewProperty<T>*, T); \
- template EXPORT T mus::View::GetLocalProperty(const mus::ViewProperty<T>*) \
- const; \
- template EXPORT void mus::View::ClearLocalProperty( \
- const mus::ViewProperty<T>*);
+#define DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(EXPORT, T) \
+ template EXPORT void mojo::View::SetLocalProperty( \
+ const mojo::ViewProperty<T>*, T); \
+ template EXPORT T mojo::View::GetLocalProperty(const mojo::ViewProperty<T>*) \
+ const; \
+ template EXPORT void mojo::View::ClearLocalProperty( \
+ const mojo::ViewProperty<T>*);
#define DECLARE_VIEW_PROPERTY_TYPE(T) DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(, T)
#define DEFINE_VIEW_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
COMPILE_ASSERT(sizeof(TYPE) <= sizeof(int64_t), property_type_too_large); \
namespace { \
- const mus::ViewProperty<TYPE> NAME##_Value = {DEFAULT, #NAME, nullptr}; \
+ const mojo::ViewProperty<TYPE> NAME##_Value = {DEFAULT, #NAME, nullptr}; \
} \
- const mus::ViewProperty<TYPE>* const NAME = &NAME##_Value;
+ const mojo::ViewProperty<TYPE>* const NAME = &NAME##_Value;
#define DEFINE_LOCAL_VIEW_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
COMPILE_ASSERT(sizeof(TYPE) <= sizeof(int64_t), property_type_too_large); \
namespace { \
- const mus::ViewProperty<TYPE> NAME##_Value = {DEFAULT, #NAME, nullptr}; \
- const mus::ViewProperty<TYPE>* const NAME = &NAME##_Value; \
+ const mojo::ViewProperty<TYPE> NAME##_Value = {DEFAULT, #NAME, nullptr}; \
+ const mojo::ViewProperty<TYPE>* const NAME = &NAME##_Value; \
}
-#define DEFINE_OWNED_VIEW_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
- namespace { \
- void Deallocator##NAME(int64_t p) { \
- enum { type_must_be_complete = sizeof(TYPE) }; \
- delete mus::ViewPropertyCaster<TYPE*>::FromInt64(p); \
- } \
- const mus::ViewProperty<TYPE*> NAME##_Value = {DEFAULT, #NAME, \
- &Deallocator##NAME}; \
- } \
- const mus::ViewProperty<TYPE*>* const NAME = &NAME##_Value;
+#define DEFINE_OWNED_VIEW_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
+ namespace { \
+ void Deallocator##NAME(int64_t 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 // COMPONENTS_MUS_PUBLIC_CPP_VIEW_PROPERTY_H_
« no previous file with comments | « components/mus/public/cpp/view_observer.h ('k') | components/mus/public/cpp/view_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698