Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index b3cdffcffd1f1bb66938f208ed62a017ccaaf1b4..12a0616c2c0b0031261db33d1e7b04e6b1ba1d4d 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -53,6 +53,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" |
@@ -538,8 +539,13 @@ Shell::~Shell() { |
// These need a valid Shell instance to clean up properly, so explicitly |
// delete them before invalidating the instance. |
// Alphabetical. TODO(oshima): sort. |
+#if defined(OS_CHROMEOS) |
James Cook
2016/09/16 18:13:31
ditto, unless the order really matters
sammiequon
2016/09/16 19:21:04
Done.
|
+ laser_pointer_controller_.reset(); |
+#endif |
magnification_controller_.reset(); |
+#if defined(OS_CHROMEOS) |
partial_magnification_controller_.reset(); |
James Cook
2016/09/16 18:13:31
optional: If partial_magnification_controller is g
sammiequon
2016/09/16 19:21:04
I don't think it should give much troubles, I prob
|
+#endif |
tooltip_controller_.reset(); |
event_client_.reset(); |
toplevel_window_event_handler_.reset(); |
@@ -783,10 +789,16 @@ 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()); |
+#endif |
+ |
magnification_controller_.reset(MagnificationController::CreateInstance()); |
wm_shell_->CreateMruWindowTracker(); |
+#if defined(OS_CHROMEOS) |
partial_magnification_controller_.reset(new PartialMagnificationController()); |
+#endif |
autoclick_controller_.reset(AutoclickController::CreateInstance()); |