Add desktop vs. ash context to ui_controls

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 d636717949dda6c182edd0d304baa95cc8ba46a5..902b81c8bfd33ded6b1cb21e9949fe5b195c6611 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -9,12 +9,12 @@
 #include "ash/wm/frame_painter.h"
 #include "ui/aura/window_property.h"
 #include "ui/gfx/rect.h"
-#include "ui/ui_controls/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*);
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
-DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
+DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControls*)
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*);
 
 namespace ash {
@@ -32,7 +32,7 @@ DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
 DEFINE_WINDOW_PROPERTY_KEY(
     ash::FramePainter*, kSoloWindowFramePainterKey, NULL);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControls,
                                  kUIControlsKey,
                                  NULL);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);