Avoids updating dock alignment when drag is cancelled

ash/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 2013 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 "ash/wm/dock/docked_window_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
@@ skipping 446 matching lines @@
 void DockedWindowLayoutManager::StartDragging(aura::Window* window) {
   DCHECK(!dragged_window_);
   dragged_window_ = window;
   DCHECK(!IsPopupOrTransient(window));
   // Start observing a window unless it is docked container's child in which
   // case it is already observed.
   wm::WindowState* dragged_state = wm::GetWindowState(dragged_window_);
   if (dragged_window_->parent() != dock_container_) {
     dragged_window_->AddObserver(this);
     dragged_state->AddObserver(this);
+  } else if (!IsAnyWindowDocked() &&

[pkotwicz, 2014/01/17 00:12:18]

The reason that we check |DragDetails::bounds_change| is not obvious to me. Can
you please add a comment?

[varkha, 2014/01/17 01:05:28]

Done.

+             dragged_state->drag_details() &&
+             !(dragged_state->drag_details()->bounds_change &
+                 WindowResizer::kBoundsChange_Resizes)) {
+    // If there are no other docked windows clear alignment when a docked window
+    // is moved.
+    alignment_ = DOCKED_ALIGNMENT_NONE;
   }
   is_dragged_from_dock_ = window->parent() == dock_container_;
   DCHECK(!is_dragged_window_docked_);
 
   // Resize all windows that are flush with the dock edge together if one of
   // them gets resized.
   if (dragged_window_->bounds().width() == docked_width_ &&
       (dragged_state->drag_details()->bounds_change &
           WindowResizer::kBoundsChange_Resizes) &&
       (dragged_state->drag_details()->size_change_direction &
@@ skipping 25 matching lines @@
 
 void DockedWindowLayoutManager::FinishDragging(DockedAction action,
                                                DockedActionSource source) {
   DCHECK(dragged_window_);
   DCHECK(!IsPopupOrTransient(dragged_window_));
   if (is_dragged_window_docked_)
     OnDraggedWindowUndocked();
   DCHECK (!is_dragged_window_docked_);
   // Stop observing a window unless it is docked container's child in which
   // case it needs to keep being observed after the drag completes.
+  wm::WindowState* dragged_state = wm::GetWindowState(dragged_window_);

[pkotwicz, 2014/01/17 00:12:18]

Nit: Move initialization of |dragged_state| to line 522.

[varkha, 2014/01/17 01:05:28]

Done. No need to change this since it is only used once.

   if (dragged_window_->parent() != dock_container_) {
     dragged_window_->RemoveObserver(this);
-    wm::GetWindowState(dragged_window_)->RemoveObserver(this);
+    dragged_state->RemoveObserver(this);
     if (last_active_window_ == dragged_window_)
       last_active_window_ = NULL;
 
     views::corewm::SetWindowShowAnimationDuration(dragged_window_,
                                                   base::TimeDelta());
   } else {
+    // If this is the first window that got docked by a move - update alignment.

[pkotwicz, 2014/01/17 00:12:18]

Nit: No hyphen

[varkha, 2014/01/17 01:05:28]

Done.

+    if (alignment_ == DOCKED_ALIGNMENT_NONE) {
+      alignment_ = GetAlignmentOfWindow(dragged_window_);
+      DCHECK(alignment_ != DOCKED_ALIGNMENT_NONE);

[pkotwicz, 2014/01/17 00:12:18]

Nit: DCHECK_NE

[pkotwicz, 2014/01/17 00:50:45]

The DCHECK() can fail when FinishDragging() is called from OnWindowDestroying().
(That seems to be the source of unit test failures). 

[varkha, 2014/01/17 01:05:28]

Done. When window is destroyed while it is being dragged the action should be
set to NONE.

+    }
     // A window is no longer dragged and is a child.
     // When a window becomes a child at drag start this is
     // the only opportunity we will have to enforce a window
     // count limit so do it here.
     MaybeMinimizeChildrenExcept(dragged_window_);
 
     views::corewm::SetWindowShowAnimationDuration(dragged_window_,
         base::TimeDelta::FromMilliseconds(kFadeDurationMs));
   }
   dragged_window_ = NULL;
@@ skipping 447 matching lines @@
 void DockedWindowLayoutManager::UpdateDockedWidth(int width) {
   if (docked_width_ == width)
     return;
   docked_width_ = width;
   UMA_HISTOGRAM_COUNTS_10000("Ash.Dock.Width", docked_width_);
 }
 
 void DockedWindowLayoutManager::OnDraggedWindowDocked(aura::Window* window) {
   DCHECK(!is_dragged_window_docked_);
   is_dragged_window_docked_ = true;
-
-  // If there are no other docked windows update alignment when the window is
-  // moved.
-  if (!IsAnyWindowDocked() &&
-      wm::GetWindowState(dragged_window_)->drag_details() &&
-      !(wm::GetWindowState(dragged_window_)->drag_details()->bounds_change &
-          WindowResizer::kBoundsChange_Resizes)) {
-    alignment_ = DOCKED_ALIGNMENT_NONE;
-  }
 }
 
 void DockedWindowLayoutManager::OnDraggedWindowUndocked() {
-  // If this is the first window getting docked by moving it - update alignment.
-  if (!IsAnyWindowDocked() &&
-      wm::GetWindowState(dragged_window_)->drag_details() &&
-      !(wm::GetWindowState(dragged_window_)->drag_details()->bounds_change &
-          WindowResizer::kBoundsChange_Resizes)) {
-    alignment_ = GetAlignmentOfWindow(dragged_window_);
-  }
   DCHECK (is_dragged_window_docked_);
   is_dragged_window_docked_ = false;
 }
 
 bool DockedWindowLayoutManager::IsAnyWindowDocked() {
   return CalculateAlignment() != DOCKED_ALIGNMENT_NONE;
 }
 
 void DockedWindowLayoutManager::Relayout() {
   if (in_layout_)
@@ skipping 288 matching lines @@
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace internal
 }  // namespace ash