| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 6f64011d9d6fcd1587fa62c87a3f506db1de1a04..6a108b036bda1746898e5d5863dc72317c509318 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -57,6 +57,7 @@
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_widget.h"
|
| #include "ash/shell_init_params.h"
|
| +#include "ash/system/chromeos/screen_layout_observer.h"
|
| #include "ash/utility/screenshot_controller.h"
|
| #include "ash/wm/ash_focus_rules.h"
|
| #include "ash/wm/ash_native_cursor_manager.h"
|
| @@ -588,6 +589,7 @@ Shell::~Shell() {
|
|
|
| #if defined(OS_CHROMEOS)
|
| screen_orientation_controller_.reset();
|
| + screen_layout_observer_.reset();
|
| #endif
|
|
|
| // Destroy the virtual keyboard controller before the maximize mode controller
|
| @@ -981,6 +983,7 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| new VideoActivityNotifier(video_detector_.get()));
|
| bluetooth_notification_controller_.reset(new BluetoothNotificationController);
|
| screen_orientation_controller_.reset(new ScreenOrientationController());
|
| + screen_layout_observer_.reset(new ScreenLayoutObserver());
|
| #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
|
|
|