Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 0697699e5fa86f4d243fd634f2d6e17f4f4c75d5..18027d5d06bb6f3de51f1d154c3bb26a29bf7ccc 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -120,6 +120,7 @@ |
#include "ash/accelerators/magnifier_key_scroller.h" |
#include "ash/accelerators/spoken_feedback_toggler.h" |
#include "ash/ash_constants.h" |
+#include "ash/content/accelerometer/sensor_manager_delegate_chromeos.h" |
#include "ash/content/display/screen_orientation_controller_chromeos.h" |
#include "ash/display/display_change_observer_chromeos.h" |
#include "ash/display/display_configurator_animation.h" |
@@ -821,6 +822,8 @@ Shell::~Shell() { |
display_configurator_->RemoveObserver(projecting_observer_.get()); |
display_change_observer_.reset(); |
+ sensor_manager_delegate_.reset(); |
+ |
PowerStatus::Shutdown(); |
// Ensure that DBusThreadManager outlives this Shell. |
@@ -1069,6 +1072,7 @@ void Shell::Init(const ShellInitParams& init_params) { |
new VideoActivityNotifier(video_detector_.get())); |
bluetooth_notification_controller_.reset(new BluetoothNotificationController); |
last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder); |
+ sensor_manager_delegate_.reset(new SensorManagerDelegateChromeOS); |
screen_orientation_controller_.reset(new ScreenOrientationController()); |
#endif |
// The compositor thread and main message loop have to be running in |