athena: Fix switching windows with title-drag in split-view.

athena/wm/title_drag_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/title_drag_controller.h"
 
 #include "base/bind.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
@@ skipping 42 matching lines @@
                  complete)));
   gfx::Transform transform;
   transform.Translate(0, complete ? window->bounds().height() : 0);
   window->SetTransform(transform);
 }
 
 void TitleDragController::OnTransitionEnd(aura::Window* window, bool complete) {
   weak_ptr_.InvalidateWeakPtrs();
   if (!tracker_.Contains(window))
     window = NULL;
-  if (complete && window && wm::IsActiveWindow(window))
-    delegate_->OnTitleDragCompleted(window);
-  else
-    delegate_->OnTitleDragCanceled(window);
   shadow_.reset();
   if (window) {
     window->SetTransform(gfx::Transform());
     tracker_.Remove(window);
   }
+  if (complete && window && wm::IsActiveWindow(window))
+    delegate_->OnTitleDragCompleted(window);
+  else
+    delegate_->OnTitleDragCanceled(window);
 }
 
 void TitleDragController::OnGestureEvent(ui::GestureEvent* gesture) {
   // Do not process any gesture events if an animation is still in progress from
   // a previous drag.
   if (weak_ptr_.HasWeakPtrs())
     return;
 
   if (gesture->type() == ui::ET_GESTURE_TAP_DOWN) {
     // It is possible to start a gesture sequence on a second window while a
@@ skipping 53 matching lines @@
     EndTransition(
         window,
         swipe_downwards &&
             (distance.y() >= kMinDragDistanceForSwitch ||
              gesture->details().velocity_y() >= kMinDragVelocityForSwitch));
     gesture->SetHandled();
   }
 }
 
 }  // namespace athena