Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 08ae5122115edb3aca30c0be99703e62da512884..d6526413e5e1c9d117fb7d7cef5f52ba5a2db46e 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -52,6 +52,7 @@ |
#include "ash/system/status_area_widget.h" |
#include "ash/system/tray/system_tray_delegate.h" |
#include "ash/system/tray/system_tray_notifier.h" |
+#include "ash/touch/touch_ctm_controller.h" |
#include "ash/wm/app_list_controller.h" |
#include "ash/wm/ash_focus_rules.h" |
#include "ash/wm/ash_native_cursor_manager.h" |
@@ -734,6 +735,8 @@ Shell::~Shell() { |
#endif |
desktop_background_controller_.reset(); |
+ touch_ctm_controller_.reset(); |
+ |
// 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. |
@@ -974,6 +977,8 @@ void Shell::Init() { |
root_window->GetHost()); |
display_controller_->InitSecondaryDisplays(); |
+ touch_ctm_controller_.reset(new TouchCTMController()); |
+ touch_ctm_controller_->UpdateTouchCTM(); |
// It needs to be created after RootWindowController has been created |
// (which calls OnWindowResized has been called, otherwise the |