Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: athena/wm/title_drag_controller.cc

Issue 468763002: athena: Fix switching windows with title-drag in split-view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/split_view_controller_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/title_drag_controller.cc
diff --git a/athena/wm/title_drag_controller.cc b/athena/wm/title_drag_controller.cc
index 36bf82383566d9877f05c808e36f133a11aded4d..b41b7fd07f74d2cde97ea6ab43ffa395a1812d74 100644
--- a/athena/wm/title_drag_controller.cc
+++ b/athena/wm/title_drag_controller.cc
@@ -60,15 +60,15 @@ 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) {
« no previous file with comments | « athena/wm/split_view_controller_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698