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 208 matching lines @@
   }
   // 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_) {
+    const wm::WMEvent event(is_docked_ ? wm::WM_EVENT_DOCK :
+                                         wm::WM_EVENT_UNDOCK);

[varkha, 2014/09/23 22:35:31]

Would WM_EVENT_NORMAL work just as well as WM_EVENT_UNDOCK (since minimized
windows are not draggable)?

[dtapuska, 2014/09/24 15:21:13]

This is what I originally had. I didn't have the WM_EVENT_UNDOCK but I failed a
test. The test was a drag while hitting a maximize accelerator; the test case
was failing because the drag was cancelled via a maximize but then this code
would execute and would end up setting it as restored; so the bounds were wrong.

I can change this to check the window state I guess; and remove the UNDOCK
event. So what t his would be is something like 
if (is_docked) {
   send WM_EVENT_DOCKED;
} else if (window_state_->IsDocked()) {
   send WM_EVENT_RESTORE;
}

So that would cover the maximize case; because presumably the window state
wouldn't be docked anymore.

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

Done.

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

Done.

+    window_state_->OnWMEvent(&event);

[varkha, 2014/09/23 22:35:31]

Is this clean in all the cases where MaybeReparentWindowOnDragCompletion does
not dock or undock? Should it be called there?

+  }
+
   // Check if the window needs to be docked or returned to workspace.
   DockedAction action = MaybeReparentWindowOnDragCompletion(is_resized,
                                                             is_attached_panel);
   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
@@ skipping 56 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