Window prerequisites for ShelfWindowWatcher panel support.

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 f4c9f9c9e4547a6843abfc3d47c703d51ec280cd..fdd1dcd1da8a2059b1233873b93aec6d1411b27a 100644
--- a/ui/aura/client/aura_constants.cc
+++ b/ui/aura/client/aura_constants.cc
@@ -11,6 +11,7 @@ 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::ImageSkia*)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int)
@@ -24,6 +25,8 @@ namespace client {
 
 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr);
 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false);