Add desktop vs. ash context to ui_controls

ash/wm/window_properties.h

Index: ash/wm/window_properties.h
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 013e08e045b6f6091fa7dc47611760a9ce1e3179..272d8a7076e39f2b3ab34763ea6f8f99c2fe5ad9 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -15,7 +15,7 @@ class Rect;
 }
 
 namespace ui_controls {
-class UIControlsAura;
+class UIControls;
 }
 
 namespace ash {
@@ -62,7 +62,7 @@ ASH_EXPORT extern const aura::WindowProperty<bool>* const
     kStayInSameRootWindowKey;
 
 // Used to store a ui_controls for each root window.
-extern const aura::WindowProperty<ui_controls::UIControlsAura*>* const
+extern const aura::WindowProperty<ui_controls::UIControls*>* const
     kUIControlsKey;
 
 // A property key to remember if a windows position or size was changed by a