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() &&

[varkha, 2014/09/29 18:59:28]

Can you comment why this change is necessary?

[dtapuska, 2014/09/29 20:59:57]

Previously docked windows were normal state type windows. What happens here; is
that a window is is docked; it will still end up with these conditions met (not
minimized & not normal state); previously it would have been false because it
would have been true on normal state type.

+      !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);
     }
@@ skipping 72 matching lines @@
       action = DOCKED_ACTION_NONE;
   }
   // When a window is newly docked it is auto-sized by docked layout adjusting
   // to other windows. If it is just dragged (but not resized) while being
   // 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_));
   }
+
+  if (action == DOCKED_ACTION_DOCK) {
+    const wm::WMEvent event(wm::WM_EVENT_DOCK);
+    window_state_->OnWMEvent(&event);
+  } else if (wm::GetWindowState(window)->IsDocked() &&
+             action == DOCKED_ACTION_UNDOCK) {
+    const wm::WMEvent event(wm::WM_EVENT_NORMAL);
+    window_state_->OnWMEvent(&event);
+  }
+
   return action;
 }
 
 }  // namespace ash