| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 5d097b6f3a834499f1cbffe3f7e0a16161bb6855..cd5022fcd0d0472a03086de28ef9bac01bc60b8b 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -121,6 +121,7 @@
|
| #include "ui/gfx/x/x11_types.h"
|
| #endif // defined(USE_X11)
|
| #include "ash/ash_constants.h"
|
| +#include "ash/content/accelerometer/sensor_manager_delegate_chromeos.h"
|
| #include "ash/content/display/screen_orientation_delegate_chromeos.h"
|
| #include "ash/display/display_change_observer_chromeos.h"
|
| #include "ash/display/display_configurator_animation.h"
|
| @@ -817,6 +818,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.
|
| @@ -1063,6 +1066,7 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| bluetooth_notification_controller_.reset(new BluetoothNotificationController);
|
| last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder);
|
| screen_orientation_delegate_.reset(new ScreenOrientationDelegate());
|
| + sensor_manager_delegate_.reset(new SensorManagerDelegateChromeOS);
|
| #endif
|
| // The compositor thread and main message loop have to be running in
|
| // order to create mirror window. Run it after the main message loop
|
|
|