Commit f517fccd authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Removed DCAA macros and update formatting of metadata macros.

Bug: 938501
Change-Id: Ie2633c0062b957bcead52fc8e507105394591122
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424515
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809586}
parent 4fd55408
......@@ -71,10 +71,11 @@
class_name)::meta_data_ = nullptr; \
\
views::metadata::ClassMetaData* class_name::MetaData() { \
if (!METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_) \
if (!METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_) { \
METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_ = \
views::metadata::MakeAndRegisterClassInfo< \
METADATA_CLASS_NAME_INTERNAL(class_name)>(); \
} \
return METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_; \
} \
\
......
......@@ -44,6 +44,8 @@ class VIEWS_EXPORT ClassMetaData {
public:
ClassMetaData();
ClassMetaData(std::string file, int line);
ClassMetaData(const ClassMetaData&) = delete;
ClassMetaData& operator=(const ClassMetaData&) = delete;
virtual ~ClassMetaData();
const std::string& type_name() const { return type_name_; }
......@@ -119,8 +121,6 @@ class VIEWS_EXPORT ClassMetaData {
ClassMetaData* parent_class_meta_data_ = nullptr;
std::string file_;
const int line_ = 0;
DISALLOW_COPY_AND_ASSIGN(ClassMetaData);
};
// Abstract base class to represent meta data about class members.
......@@ -131,6 +131,8 @@ class VIEWS_EXPORT MemberMetaDataBase {
MemberMetaDataBase(const std::string& member_name,
const std::string& member_type)
: member_name_(member_name), member_type_(member_type) {}
MemberMetaDataBase(const MemberMetaDataBase&) = delete;
MemberMetaDataBase& operator=(const MemberMetaDataBase&) = delete;
virtual ~MemberMetaDataBase() = default;
// Access the value of this member and return it as a string.
......@@ -152,8 +154,6 @@ class VIEWS_EXPORT MemberMetaDataBase {
private:
std::string member_name_;
std::string member_type_;
DISALLOW_COPY_AND_ASSIGN(MemberMetaDataBase);
}; // class MemberMetaDataBase
} // namespace metadata
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment