Add desktop vs. ash context to ui_controls

ash/ui_controls_ash.cc

Index: ash/ui_controls_ash.cc
diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc
index 3ff3b46c1260b0b3b41f6180c2a9bb9320ebc8c9..95dea99b7824b873c0da11261b9e41848ad18849 100644
--- a/ash/ui_controls_ash.cc
+++ b/ash/ui_controls_ash.cc
@@ -8,10 +8,10 @@
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
+#include "ui/aura/desktop_ui_controls.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
 #include "ui/gfx/screen.h"
-#include "ui/ui_controls/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
 
 namespace ash {
 namespace internal {
@@ -20,12 +20,12 @@ namespace {
 // Returns the UIControls object for RootWindow.
 // kUIControlsKey is owned property and UIControls object
 // will be deleted when the root window is deleted.
-ui_controls::UIControlsAura* GetUIControlsForRootWindow(
+ui_controls::UIControls* GetUIControlsForRootWindow(
     aura::RootWindow* root_window) {
-  ui_controls::UIControlsAura* native_ui_control =
+  ui_controls::UIControls* native_ui_control =
       root_window->GetProperty(kUIControlsKey);
   if (!native_ui_control) {
-    native_ui_control = aura::CreateUIControlsAura(root_window);
+    native_ui_control = aura::CreateDesktopUIControls(root_window);
     // Pass the ownership to the |root_window|.
     root_window->SetProperty(kUIControlsKey, native_ui_control);
   }
@@ -34,9 +34,9 @@ ui_controls::UIControlsAura* GetUIControlsForRootWindow(
 
 // Returns the UIControls object for the RootWindow at the |point_in_screen|
 // in virtual screen coordinates, and updates the |point| relative to the
-// UIControlsAura's root window.  NULL if there is no RootWindow under
+// UIControls's root window.  NULL if there is no RootWindow under
 // the |point_in_screen|.
-ui_controls::UIControlsAura* GetUIControlsAt(gfx::Point* point_in_screen) {
+ui_controls::UIControls* GetUIControlsAt(gfx::Point* point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
   aura::RootWindow* root = wm::GetRootWindowAt(*point_in_screen);
 
@@ -50,7 +50,7 @@ ui_controls::UIControlsAura* GetUIControlsAt(gfx::Point* point_in_screen) {
 
 }  // namespace
 
-class UIControlsAsh : public ui_controls::UIControlsAura {
+class UIControlsAsh : public ui_controls::UIControls {
  public:
   UIControlsAsh() {
   }
@@ -78,14 +78,14 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       const base::Closure& closure) OVERRIDE {
     aura::RootWindow* root =
         window ? window->GetRootWindow() : Shell::GetActiveRootWindow();
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
+    ui_controls::UIControls* ui_controls = GetUIControlsForRootWindow(root);
     return ui_controls && ui_controls->SendKeyPressNotifyWhenDone(
         window, key, control, shift, alt, command, closure);
   }
 
   virtual bool SendMouseMove(long x, long y) OVERRIDE {
     gfx::Point p(x, y);
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    ui_controls::UIControls* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseMove(p.x(), p.y());
   }
 
@@ -94,7 +94,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       long y,
       const base::Closure& closure) OVERRIDE {
     gfx::Point p(x, y);
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    ui_controls::UIControls* ui_controls = GetUIControlsAt(&p);
     return ui_controls &&
         ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
   }
@@ -102,7 +102,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
   virtual bool SendMouseEvents(ui_controls::MouseButton type,
                                int state) OVERRIDE {
     gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    ui_controls::UIControls* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
 
@@ -111,20 +111,20 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       int state,
       const base::Closure& closure) OVERRIDE {
     gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    ui_controls::UIControls* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
         type, state, closure);
   }
 
   virtual bool SendMouseClick(ui_controls::MouseButton type) OVERRIDE {
     gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    ui_controls::UIControls* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }
 
   virtual void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) OVERRIDE {
-    ui_controls::UIControlsAura* ui_controls = GetUIControlsForRootWindow(
+    ui_controls::UIControls* ui_controls = GetUIControlsForRootWindow(
         Shell::GetActiveRootWindow());
     if (ui_controls)
       ui_controls->RunClosureAfterAllPendingUIEvents(closure);
@@ -134,7 +134,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
-ui_controls::UIControlsAura* CreateUIControls() {
+ui_controls::UIControls* CreateUIControls() {
   return new UIControlsAsh();
 }