Add desktop vs. ash context to ui_controls

ui/aura/ui_controls_x11.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 <X11/keysym.h>
 #include <X11/Xlib.h>
 
 // X macro fail.
 #if defined(RootWindow)
 #undef RootWindow
 #endif
 
 #include "base/logging.h"
 #include "base/message_pump_aurax11.h"
+#include "ui/aura/desktop_ui_controls.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/compositor/dip_util.h"
-#include "ui/ui_controls/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
 
 namespace aura {
 namespace {
 
 // Mask of the buttons currently down.
 unsigned button_down_mask = 0;
 
 // Event waiter executes the specified closure|when a matching event
 // is found.
 // TODO(oshima): Move this to base.
@@ skipping 40 matching lines @@
                      "marker_event",
                      False);
 }
 
 // Returns true when the event is a marker event.
 bool Matcher(const base::NativeEvent& event) {
   return event->xany.type == ClientMessage &&
       event->xclient.message_type == MarkerEventAtom();
 }
 
-class UIControlsX11 : public ui_controls::UIControlsAura {
+class UIControlsX11 : public ui_controls::UIControls {
  public:
   UIControlsX11(RootWindow* root_window) : root_window_(root_window) {
   }
 
   virtual bool SendKeyPress(gfx::NativeWindow window,
                             ui::KeyboardCode key,
                             bool control,
                             bool shift,
                             bool alt,
                             bool command) {
@@ skipping 138 matching lines @@
     root_window_->PostNativeEvent(xevent);
   }
 
   RootWindow* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(UIControlsX11);
 };
 
 }  // namespace
 
-ui_controls::UIControlsAura* CreateUIControlsAura(RootWindow* root_window) {
+ui_controls::UIControls* CreateDesktopUIControls(RootWindow* root_window) {
   return new UIControlsX11(root_window);
 }
 
 }  // namespace aura