diff options
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index c8f65bd..8bd4460 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -114,7 +114,6 @@ #if defined(USE_X11) #include "ash/accelerators/magnifier_key_scroller.h" #include "ash/accelerators/spoken_feedback_toggler.h" -#include "ash/touch/touch_transformer_controller.h" #include "ui/gfx/x/x11_types.h" #endif // defined(USE_X11) #include "ash/ash_constants.h" @@ -757,10 +756,6 @@ Shell::~Shell() { #endif desktop_background_controller_.reset(); -#if defined(OS_CHROMEOS) && defined(USE_X11) - touch_transformer_controller_.reset(); -#endif // defined(OS_CHROMEOS) && defined(USE_X11) - // This also deletes all RootWindows. Note that we invoke Shutdown() on // DisplayController before resetting |display_controller_|, since destruction // of its owned RootWindowControllers relies on the value. @@ -992,13 +987,6 @@ void Shell::Init() { base::Unretained(system_tray_delegate_.get())))); #endif -#if defined(OS_CHROMEOS) && defined(USE_X11) - // Create TouchTransformerController before DisplayController::InitDisplays() - // since TouchTransformerController listens on - // DisplayController::Observer::OnDisplaysInitialized(). - touch_transformer_controller_.reset(new TouchTransformerController()); -#endif // defined(OS_CHROMEOS) && defined(USE_X11) - display_controller_->InitDisplays(); // It needs to be created after RootWindowController has been created |