| Index: athena/wm/title_drag_controller.cc
|
| diff --git a/athena/wm/title_drag_controller.cc b/athena/wm/title_drag_controller.cc
|
| index b41b7fd07f74d2cde97ea6ab43ffa395a1812d74..a0301e101a224c4c14b0b2f33ee70e52335950a3 100644
|
| --- a/athena/wm/title_drag_controller.cc
|
| +++ b/athena/wm/title_drag_controller.cc
|
| @@ -59,7 +59,7 @@ void TitleDragController::EndTransition(aura::Window* window, bool complete) {
|
| void TitleDragController::OnTransitionEnd(aura::Window* window, bool complete) {
|
| weak_ptr_.InvalidateWeakPtrs();
|
| if (!tracker_.Contains(window))
|
| - window = NULL;
|
| + window = nullptr;
|
| shadow_.reset();
|
| if (window) {
|
| window->SetTransform(gfx::Transform());
|
|
|