Add UIControlsAsh that works with multiple root windows

ash/wm/window_properties.cc

Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index a4a9a902f0699c8cc0c43024918aab3a9bc74dac..4b2b80a285e7241bcceba93c8e659e0ee40f1830 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);