Added metadata macro for use on nested classes.

For a nested class use BEGIN_NESTED_METADATA(outer_class, class_name, parent_class_name)

The use of the other macros remain the same.

Bug: 1166802
Change-Id: I125dce952969d529e0277559ab739ef89bae9afa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631607Reviewed-by: Wei Li <weili@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846185}

ash/frame/non_client_frame_view_ash.cc

@@ -32,6 +32,7 @@
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/views/metadata/metadata_header_macros.h"
 #include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter.h"
@@ -156,6 +157,7 @@ class NonClientFrameViewAshImmersiveHelper : public WindowStateObserver,
 class NonClientFrameViewAsh::OverlayView : public views::View,
                                            public views::ViewTargeterDelegate {
  public:
+  METADATA_HEADER(OverlayView);
   explicit OverlayView(HeaderView* header_view);
   OverlayView(const OverlayView&) = delete;
   OverlayView& operator=(const OverlayView&) = delete;
@@ -163,7 +165,6 @@ class NonClientFrameViewAsh::OverlayView : public views::View,
 
   // views::View:
   void Layout() override;
-  const char* GetClassName() const override { return "OverlayView"; }
 
  private:
   // views::ViewTargeterDelegate:
@@ -208,6 +209,9 @@ bool NonClientFrameViewAsh::OverlayView::DoesIntersectRect(
   return header_view_->HitTestRect(rect);
 }
 
+BEGIN_NESTED_METADATA(NonClientFrameViewAsh, OverlayView, views::View)
+END_METADATA
+
 NonClientFrameViewAsh::NonClientFrameViewAsh(views::Widget* frame)
     : frame_(frame),
       header_view_(new HeaderView(frame, this)),

ui/views/metadata/metadata_impl_macros.h

@@ -16,12 +16,19 @@
 // Generate the implementation of the metadata accessors and internal class with
 // additional macros for defining the class' properties.
 
-#define BEGIN_METADATA_BASE(class_name) BEGIN_METADATA_INTERNAL(class_name)
+#define BEGIN_METADATA_BASE(class_name) \
+  BEGIN_METADATA_INTERNAL(              \
+      class_name, METADATA_CLASS_NAME_INTERNAL(class_name), class_name)
+
+#define BEGIN_NESTED_METADATA(outer_class, class_name, parent_class_name) \
+  BEGIN_METADATA_INTERNAL(outer_class::class_name,                        \
+                          METADATA_CLASS_NAME_INTERNAL(class_name),       \
+                          parent_class_name)                              \
+  METADATA_PARENT_CLASS_INTERNAL(parent_class_name)
 
 #define BEGIN_METADATA(class_name, parent_class_name)                          \
-  static_assert(std::is_base_of<parent_class_name, class_name>::value, \
-                "class not child of parent");                          \
-  BEGIN_METADATA_INTERNAL(class_name)                                  \
+  BEGIN_METADATA_INTERNAL(                                                     \
+      class_name, METADATA_CLASS_NAME_INTERNAL(class_name), parent_class_name) \
   METADATA_PARENT_CLASS_INTERNAL(parent_class_name)
 
 #define END_METADATA }

ui/views/metadata/metadata_macros_internal.h

@@ -14,8 +14,6 @@
 // Internal Metadata Generation Helpers ---------------------------------------
 
 #define METADATA_CLASS_NAME_INTERNAL(class_name) class_name##_MetaData
-#define METADATA_FUNCTION_PREFIX_INTERNAL(class_name) \
-  class_name::METADATA_CLASS_NAME_INTERNAL(class_name)
 
 // Metadata Accessors ---------------------------------------------------------
 #define METADATA_ACCESSORS_INTERNAL(class_name)      \
@@ -66,30 +64,34 @@
       decltype(std::declval<ViewClass>().Get##property_name()),                \
       &ViewClass::Get##property_name>
 
-#define BEGIN_METADATA_INTERNAL(class_name)                                 \
-  views::metadata::ClassMetaData* class_name::METADATA_CLASS_NAME_INTERNAL( \
-      class_name)::meta_data_ = nullptr;                                    \
+#define BEGIN_METADATA_INTERNAL(qualified_class_name, metadata_class_name,   \
+                                parent_class_name)                           \
+  views::metadata::ClassMetaData*                                            \
+      qualified_class_name::metadata_class_name::meta_data_ = nullptr;       \
                                                                              \
-  views::metadata::ClassMetaData* class_name::MetaData() {                  \
-    if (!METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_) {            \
-      METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_ =                \
+  views::metadata::ClassMetaData* qualified_class_name::MetaData() {         \
+    static_assert(                                                           \
+        std::is_base_of<parent_class_name, qualified_class_name>::value,     \
+        "class not child of parent");                                        \
+    if (!qualified_class_name::metadata_class_name::meta_data_) {            \
+      qualified_class_name::metadata_class_name::meta_data_ =                \
           views::metadata::MakeAndRegisterClassInfo<                         \
-              METADATA_CLASS_NAME_INTERNAL(class_name)>();                  \
+              qualified_class_name::metadata_class_name>();                  \
     }                                                                        \
-    return METADATA_CLASS_NAME_INTERNAL(class_name)::meta_data_;            \
+    return qualified_class_name::metadata_class_name::meta_data_;            \
   }                                                                          \
                                                                              \
-  views::metadata::ClassMetaData* class_name::GetClassMetaData() {          \
+  views::metadata::ClassMetaData* qualified_class_name::GetClassMetaData() { \
     return MetaData();                                                       \
   }                                                                          \
                                                                              \
-  const char* class_name::GetClassName() const {                            \
-    return class_name::kViewClassName;                                      \
+  const char* qualified_class_name::GetClassName() const {                   \
+    return kViewClassName;                                                   \
   }                                                                          \
-  const char class_name::kViewClassName[] = #class_name;                    \
+  const char qualified_class_name::kViewClassName[] = #qualified_class_name; \
                                                                              \
-  void METADATA_FUNCTION_PREFIX_INTERNAL(class_name)::BuildMetaData() {     \
-    SetTypeName(std::string(#class_name));
+  void qualified_class_name::metadata_class_name::BuildMetaData() {          \
+    SetTypeName(std::string(#qualified_class_name));
 
 #define METADATA_PARENT_CLASS_INTERNAL(parent_class_name) \
   SetParentClassMetaData(parent_class_name::MetaData());