| Index: ui/ui_controls/ui_controls_aura.cc | 
| diff --git a/ui/ui_controls/ui_controls_aura.cc b/ui/ui_controls/ui_controls_aura.cc | 
| index f2e4498d0223b40fd4fbec62cca657775fedf925..d5d8e2aeeaba37a8c4095f6c126526809279968f 100644 | 
| --- a/ui/ui_controls/ui_controls_aura.cc | 
| +++ b/ui/ui_controls/ui_controls_aura.cc | 
| @@ -2,82 +2,15 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "ui/ui_controls/ui_controls_aura.h" | 
| +#include "ui/ui_controls/ui_controls.h" | 
|  | 
| #include "base/logging.h" | 
|  | 
| namespace ui_controls { | 
| -namespace { | 
| -UIControlsAura* instance_ = NULL; | 
| -}  // namespace | 
|  | 
| -// An interface to provide Aura implementation of UI control. | 
| -bool SendKeyPress(gfx::NativeWindow window, | 
| -                  ui::KeyboardCode key, | 
| -                  bool control, | 
| -                  bool shift, | 
| -                  bool alt, | 
| -                  bool command) { | 
| -  return instance_->SendKeyPress( | 
| -      window, key, control, shift, alt, command); | 
| -} | 
| - | 
| -// static | 
| -bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, | 
| -                                ui::KeyboardCode key, | 
| -                                bool control, | 
| -                                bool shift, | 
| -                                bool alt, | 
| -                                bool command, | 
| -                                const base::Closure& task) { | 
| -  return instance_->SendKeyPressNotifyWhenDone( | 
| -      window, key, control, shift, alt, command, task); | 
| -} | 
| - | 
| -// static | 
| -bool SendMouseMove(long x, long y) { | 
| -  return instance_->SendMouseMove(x, y); | 
| -} | 
| - | 
| -// static | 
| -bool SendMouseMoveNotifyWhenDone(long x, | 
| -                                 long y, | 
| -                                 const base::Closure& task) { | 
| -  return instance_->SendMouseMoveNotifyWhenDone(x, y, task); | 
| -} | 
| - | 
| -// static | 
| -bool SendMouseEvents(MouseButton type, int state) { | 
| -  return instance_->SendMouseEvents(type, state); | 
| -} | 
| - | 
| -// static | 
| -bool SendMouseEventsNotifyWhenDone(MouseButton type, | 
| -                                   int state, | 
| -                                   const base::Closure& task) { | 
| -  return instance_->SendMouseEventsNotifyWhenDone(type, state, task); | 
| -} | 
| - | 
| -// static | 
| -bool SendMouseClick(MouseButton type) { | 
| -  return instance_->SendMouseClick(type); | 
| -} | 
| - | 
| -// static | 
| -void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { | 
| -  instance_->RunClosureAfterAllPendingUIEvents(closure); | 
| -} | 
| - | 
| -UIControlsAura::UIControlsAura() { | 
| -} | 
| - | 
| -UIControlsAura::~UIControlsAura() { | 
| -} | 
| - | 
| -// static. declared in ui_controls.h | 
| -void InstallUIControlsAura(UIControlsAura* instance) { | 
| -  delete instance_; | 
| -  instance_ = instance; | 
| +UIControls* CreateNativeUIControls() { | 
| +  NOTIMPLEMENTED() << "Implementation should be installed at a higher level."; | 
| +  return NULL; | 
| } | 
|  | 
| }  // namespace ui_controls | 
|  |