Add window states docked; and docked minimized. Add wm window event to set docked and undocked.

ash/wm/dock/docked_window_resizer.cc

 // Copyright 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_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/wm_event.h"
 #include "ash/wm/workspace/magnetism_matcher.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 187 matching lines @@
   did_move_or_resize_ = false;
   aura::Window* window = GetTarget();
   const bool is_attached_panel = window->type() == ui::wm::WINDOW_TYPE_PANEL &&
                                  window_state_->panel_attached();
   const bool is_resized =
       (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0;
 
   // Undock the window if it is not in the normal or minimized state type. This
   // happens if a user snaps or maximizes a window using a keyboard shortcut
   // while it is being dragged.
-  if (!window_state_->IsMinimized() && !window_state_->IsNormalStateType())
+  if (!window_state_->IsMinimized() && !window_state_->IsDocked() &&
+      !window_state_->IsNormalStateType())
     is_docked_ = false;
 
   // When drag is completed the dragged docked window is resized to the bounds
   // calculated by the layout manager that conform to other docked windows.
   if (!is_attached_panel && is_docked_ && !is_resized) {
     gfx::Rect bounds = ScreenUtil::ConvertRectFromScreen(
         window->parent(), dock_layout_->dragged_bounds());
     if (!bounds.IsEmpty() && bounds.width() != window->bounds().width()) {
       window->SetBounds(bounds);
     }
   }
   // If a window has restore bounds, update the restore origin and width but not
   // the height (since the height is auto-calculated for the docked windows).
   if (is_resized && is_docked_ && window_state_->HasRestoreBounds()) {
     gfx::Rect restore_bounds = window->GetBoundsInScreen();
     restore_bounds.set_height(
         window_state_->GetRestoreBoundsInScreen().height());
     window_state_->SetRestoreBoundsInScreen(restore_bounds);
   }
 
+  if (move_result != aura::client::MOVE_CANCELED && is_docked_ != was_docked_) {
+    if (is_docked_) {
+      const wm::WMEvent event(wm::WM_EVENT_DOCK);
+      window_state_->OnWMEvent(&event);
+    } else if (window_state_->IsDocked()) {
+      const wm::WMEvent event(wm::WM_EVENT_NORMAL);
+      window_state_->OnWMEvent(&event);
+    }
+  }
+
   // Check if the window needs to be docked or returned to workspace.
   DockedAction action = MaybeReparentWindowOnDragCompletion(is_resized,
                                                             is_attached_panel);

[varkha, 2014/09/25 22:09:28]

There is still an outstanding comment here about
MaybeReparentWindowOnDragCompletion that might not be in exact match with the
window_state_->OnWMEvent() above. Is this a concern?

[dtapuska, 2014/09/26 14:17:07]

I moved the code around; so the event sending is inside the reparenting method. 

   dock_layout_->FinishDragging(
       move_result == aura::client::MOVE_CANCELED ? DOCKED_ACTION_NONE : action,
       details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
           DOCKED_ACTION_SOURCE_MOUSE : DOCKED_ACTION_SOURCE_TOUCH);
 
   // If we started the drag in one root window and moved into another root
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_dock_layout_ != dock_layout_)
     initial_dock_layout_->FinishDragging(
@@ skipping 53 matching lines @@
   // docked it is auto-sized unless it has been resized while being docked
   // before.
   if (is_docked_) {
     wm::GetWindowState(window)->set_bounds_changed_by_user(
         was_docked_ && (is_resized || was_bounds_changed_by_user_));
   }
   return action;
 }
 
 }  // namespace ash