Add desktop vs. ash context to ui_controls

ui/aura/ui_controls_x11.cc

Index: ui/aura/ui_controls_x11.cc
diff --git a/ui/aura/ui_controls_x11.cc b/ui/aura/ui_controls_x11.cc
index 47f37ee7dc879bf077678e84641cb47a3361ea65..44975eb987c6297d84b49f5ad5c66139b47d4e2f 100644
--- a/ui/aura/ui_controls_x11.cc
+++ b/ui/aura/ui_controls_x11.cc
@@ -12,11 +12,11 @@
 
 #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 {
@@ -77,7 +77,7 @@ bool Matcher(const base::NativeEvent& event) {
       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) {
   }
@@ -234,10 +234,10 @@ class UIControlsX11 : public ui_controls::UIControlsAura {
   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
+
 }  // namespace aura