Add desktop vs. ash context to ui_controls

ui/aura/ui_controls_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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) {
   }
 
   // UIControlsAura overrides:
   virtual bool SendKeyPress(gfx::NativeWindow native_window,
                             ui::KeyboardCode key,
                             bool control,
                             bool shift,
                             bool alt,
@@ skipping 45 matching lines @@
     MessageLoopForUI::current()->PostTask(FROM_HERE, closure);
   }
 
  private:
   RootWindow* root_window_;
   DISALLOW_COPY_AND_ASSIGN(UIControlsWin);
 };
 
 }  // namespace
 
-ui_controls::UIControlsAura* CreateUIControlsAura(RootWindow* root_window) {
+AURA_EXPORT ui_controls::UIControls* CreateDesktopUIControls(
+    RootWindow* root_window) {
   return new UIControlsWin(root_window);
 }
 
 }  // namespace aura