| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 82ff30d1bbf6709785886b960f26a191c455f4ff..06e35fc95766f9bd2500bc7168df8228628e569e 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -358,7 +358,7 @@ void RootWindowController::CloseChildWindows() {
|
| shelf_->ShutdownStatusAreaWidget();
|
|
|
| if (shelf_->shelf_layout_manager())
|
| - shelf_->shelf_layout_manager()->set_workspace_controller(NULL);
|
| + shelf_->shelf_layout_manager()->PrepareForShutdown();
|
|
|
| // Close background widget first as it depends on tooltip.
|
| wallpaper_controller_.reset();
|
|
|