Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 9c211fc9360204fee838b499d6369311d6cd65a8..c992a548c761c601982ebd944f940e562673cbfa 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -126,6 +126,7 @@ |
#include "ash/display/screen_orientation_controller_chromeos.h" |
#include "ash/sticky_keys/sticky_keys_controller.h" |
#include "ash/system/chromeos/power/power_event_observer.h" |
+#include "ash/system/chromeos/power/tablet_power_button_controller.h" |
#include "ash/system/chromeos/power/video_activity_notifier.h" |
#include "ash/touch/touch_transformer_controller.h" |
#include "ash/virtual_keyboard_controller.h" |
@@ -514,6 +515,9 @@ Shell::~Shell() { |
toplevel_window_event_handler_.reset(); |
visibility_controller_.reset(); |
+#if defined(OS_CHROMEOS) |
+ tablet_power_button_controller_.reset(); |
+#endif |
power_button_controller_.reset(); |
lock_state_controller_.reset(); |
@@ -823,6 +827,8 @@ void Shell::Init(const ShellInitParams& init_params) { |
bluetooth_notification_controller_.reset(new BluetoothNotificationController); |
screen_orientation_controller_.reset(new ScreenOrientationController()); |
screen_layout_observer_.reset(new ScreenLayoutObserver()); |
+ tablet_power_button_controller_.reset( |
+ new TabletPowerButtonController(lock_state_controller_.get())); |
#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 |