2 files changed, 13 insertions, 0 deletions
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index a4a9a90..4b2b80a 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -6,11 +6,13 @@
 
 #include "ash/wm/shadow_types.h"
 #include "ui/aura/window_property.h"
+#include "ui/ui_controls/ui_controls_aura.h"
 
 // Property type for bool and ui::WindowShowState are
 // defined in aura.
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
+DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
 
 namespace ash {
 namespace internal {
@@ -20,6 +22,9 @@ DEFINE_WINDOW_PROPERTY_KEY(
 DEFINE_WINDOW_PROPERTY_KEY(
     ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
+                                 kUIControlsKey,
+                                 NULL);
 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
                            kWindowPersistsAcrossAllWorkspacesKey,
                            WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 9f79a44..760bcd4 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -11,6 +11,10 @@
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
+namespace ui_controls {
+class UIControlsAura;
+}
+
 namespace ash {
 namespace internal {
 
@@ -31,6 +35,10 @@ extern const aura::WindowProperty<ui::WindowShowState>* const
 // window.  If unset, no shadow is displayed.
 extern const aura::WindowProperty<ShadowType>* const kShadowTypeKey;
 
+// Used to store a ui_controls for each root window.
+extern const aura::WindowProperty<ui_controls::UIControlsAura*>* const
+    kUIControlsKey;
+
 extern const aura::WindowProperty<WindowPersistsAcrossAllWorkspacesType>* const
     kWindowPersistsAcrossAllWorkspacesKey;