Adding a way to associate Android Activities with PlatformWindowAndroid

ui/aura/client/aura_constants.cc

Index: ui/aura/client/aura_constants.cc
diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc
index 18733c7d3b17e0befdc6fe0ceb694350c09f3a63..95dd1c8a87b167d0a8029e777e125d7e63cf1efc 100644
--- a/ui/aura/client/aura_constants.cc
+++ b/ui/aura/client/aura_constants.cc
@@ -7,6 +7,10 @@
 #include "ui/aura/window_property.h"
 #include "ui/gfx/geometry/rect.h"
 
+#if defined(OS_ANDROID)
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, jobject);
+#endif
+
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
@@ -20,6 +24,10 @@ namespace client {
 
 // Alphabetical sort.
 
+#if defined(OS_ANDROID)
+DEFINE_WINDOW_PROPERTY_KEY(jobject, kActivityForRootWindow, nullptr);
+#endif
+
 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false);