Index: ash/common/wm_shell.cc |
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc |
index c98fa1dbc15e3e32cd1d67fec634d25dd54f3742..5db986e82044dab660a8929d40438436fa2d627e 100644 |
--- a/ash/common/wm_shell.cc |
+++ b/ash/common/wm_shell.cc |
@@ -25,6 +25,7 @@ |
#include "ash/common/system/toast/toast_manager.h" |
#include "ash/common/system/tray/system_tray_delegate.h" |
#include "ash/common/system/tray/system_tray_notifier.h" |
+#include "ash/common/wallpaper/wallpaper_controller.h" |
#include "ash/common/wallpaper/wallpaper_delegate.h" |
#include "ash/common/wm/immersive_context_ash.h" |
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
@@ -76,11 +77,15 @@ void WmShell::Initialize() { |
views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
new_window_delegate_.reset(delegate_->CreateNewWindowDelegate()); |
+ |
+ wallpaper_controller_.reset(new WallpaperController(GetBlockingPool())); |
} |
void WmShell::Shutdown() { |
- // Accesses WmShell in its destructor. |
+ // These members access WmShell in their destructors. |
accessibility_delegate_.reset(); |
+ wallpaper_controller_.reset(); |
James Cook
2016/09/07 21:27:05
nit: destroy before accessibility_delegate unless
msw
2016/09/07 22:28:24
Done.
|
+ |
// ShelfWindowWatcher has window observers and a pointer to the shelf model. |
shelf_window_watcher_.reset(); |
// ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC |