Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index d8987ee0d778acdc0fe4c865f63d5331ce22a4e2..544c6fe3d27e54ef45ab4f3f09174275d559002e 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -53,6 +53,7 @@ |
| #include "ash/shell_window_ids.h" |
| #include "ash/system/locale/locale_notification_controller.h" |
| #include "ash/system/status_area_widget.h" |
| +#include "ash/system/toast/toast_manager.h" |
| #include "ash/system/tray/system_tray_delegate.h" |
| #include "ash/system/tray/system_tray_notifier.h" |
| #include "ash/utility/partial_screenshot_controller.h" |
| @@ -761,6 +762,8 @@ Shell::~Shell() { |
| window_cycle_controller_.reset(); |
| window_selector_controller_.reset(); |
| + toast_manager_.reset(); |
|
oshima
2016/03/15 09:07:32
can you move this to the reverse order of the crea
yoshiki
2016/03/15 15:04:22
Done.
|
| + |
| // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| |
| // and has window observers. |
| shelf_window_watcher_.reset(); |
| @@ -980,6 +983,8 @@ void Shell::Init(const ShellInitParams& init_params) { |
| sticky_keys_controller_.reset(new StickyKeysController); |
| #endif |
| + toast_manager_.reset(new ToastManager); |
| + |
| lock_state_controller_.reset(new LockStateController); |
| power_button_controller_.reset(new PowerButtonController( |
| lock_state_controller_.get())); |