| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 837550605183be4a0337a37e1cd11a70ff1752d7..335ae25068d5afe9cc8ad2fe71b1b765bdb2336d 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -541,7 +541,7 @@ void RootWindowController::CloseChildWindows() {
|
| void RootWindowController::MoveWindowsTo(aura::Window* dst) {
|
| // Forget the shelf early so that shelf don't update itself using wrong
|
| // display info.
|
| - workspace_controller_->SetShelf(NULL);
|
| + workspace_controller_->set_shelf(nullptr);
|
| ReparentAllWindows(GetRootWindow(), dst);
|
| }
|
|
|
|
|