Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 689c6853eb9950f68becadcf4b34193537e43401..3d336fa23d68e1591f98b2533649c837ce426a0d 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -52,6 +52,7 @@ |
#include "ash/high_contrast/high_contrast_controller.h" |
#include "ash/host/ash_window_tree_host_init_params.h" |
#include "ash/ime/input_method_event_handler.h" |
+#include "ash/laser/laser_pointer_controller.h" |
#include "ash/magnifier/magnification_controller.h" |
#include "ash/magnifier/partial_magnification_controller.h" |
#include "ash/root_window_controller.h" |
@@ -623,7 +624,6 @@ Shell::~Shell() { |
// delete them before invalidating the instance. |
// Alphabetical. TODO(oshima): sort. |
magnification_controller_.reset(); |
- partial_magnification_controller_.reset(); |
tooltip_controller_.reset(); |
event_client_.reset(); |
toplevel_window_event_handler_.reset(); |
@@ -646,6 +646,8 @@ Shell::~Shell() { |
touch_transformer_controller_.reset(); |
stylus_metrics_recorder_.reset(); |
audio_a11y_controller_.reset(); |
+ laser_pointer_controller_.reset(); |
+ partial_magnification_controller_.reset(); |
#endif // defined(OS_CHROMEOS) |
// This also deletes all RootWindows. Note that we invoke Shutdown() on |
@@ -879,11 +881,14 @@ void Shell::Init(const ShellInitParams& init_params) { |
// RootWindowController as possible. |
visibility_controller_.reset(new AshVisibilityController); |
+#if defined(OS_CHROMEOS) |
+ laser_pointer_controller_.reset(new LaserPointerController()); |
+ partial_magnification_controller_.reset(new PartialMagnificationController()); |
+#endif |
+ |
magnification_controller_.reset(MagnificationController::CreateInstance()); |
wm_shell_->CreateMruWindowTracker(); |
- partial_magnification_controller_.reset(new PartialMagnificationController()); |
- |
autoclick_controller_.reset(AutoclickController::CreateInstance()); |
high_contrast_controller_.reset(new HighContrastController); |