Window prerequisites for ShelfWindowWatcher panel support.

ui/aura/client/aura_constants.h

Index: ui/aura/client/aura_constants.h
diff --git a/ui/aura/client/aura_constants.h b/ui/aura/client/aura_constants.h
index 3a054c2b4d3cae9971d5375e2c796ee396d1569a..bf74a0d553c7c7070e03ae5334c3a6fdcdc7fc09 100644
--- a/ui/aura/client/aura_constants.h
+++ b/ui/aura/client/aura_constants.h
@@ -5,6 +5,8 @@
 #ifndef UI_AURA_CLIENT_AURA_CONSTANTS_H_
 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_
 
+#include <string>
+
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window.h"
@@ -26,6 +28,12 @@ AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey;
 // of value is an int.
 AURA_EXPORT extern const WindowProperty<bool>* const kAnimationsDisabledKey;
 
+// A property key to store the app icon, typically larger for shelf icons, etc.
+AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kAppIconKey;
+
+// A property key to store the string id of the app associated with this window.
+AURA_EXPORT extern const WindowProperty<std::string*>* const kAppIdKey;
+
 // A property key to store the type of window that will be used to record
 // pointer metrics. See AppType in ash/shared/app_types.h for more details.
 AURA_EXPORT extern const WindowProperty<int>* const kAppType;
@@ -83,7 +91,7 @@ AURA_EXPORT extern const aura::WindowProperty<int>* const kTopViewInset;
 // The color of the window header.
 AURA_EXPORT extern const aura::WindowProperty<SkColor>* const kTopViewColor;
 
-// A property key to store window icon.
+// A property key to store the window icon, typically 16x16 for title bars.
 AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kWindowIconKey;
 
 // Alphabetical sort.