Add desktop vs. ash context to ui_controls

ui/aura/ui_controls_win.cc

Index: ui/aura/ui_controls_win.cc
diff --git a/ui/aura/ui_controls_win.cc b/ui/aura/ui_controls_win.cc
index a28d5537666d43d8c4ca67af79863fae09e49b8e..eb6ffdc770e74ba9b8e59d80aac36ed6243047bc 100644
--- a/ui/aura/ui_controls_win.cc
+++ b/ui/aura/ui_controls_win.cc
@@ -5,14 +5,14 @@
 #include "base/logging.h"
 #include "base/basictypes.h"
 #include "base/message_loop.h"
+#include "ui/aura/aura_export.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
-#include "ui/ui_controls/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/ui_controls/ui_controls_internal_win.h"
 
 namespace aura {
 namespace {
-class UIControlsWin : public ui_controls::UIControlsAura {
+class UIControlsWin : public ui_controls::UIControls {
  public:
   UIControlsWin(RootWindow* root_window) : root_window_(root_window) {
   }
@@ -78,7 +78,8 @@ class UIControlsWin : public ui_controls::UIControlsAura {
 
 }  // namespace
 
-ui_controls::UIControlsAura* CreateUIControlsAura(RootWindow* root_window) {
+AURA_EXPORT ui_controls::UIControls* CreateDesktopUIControls(
+    RootWindow* root_window) {
   return new UIControlsWin(root_window);
 }