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

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/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 797 matching lines @@
 void DockedWindowLayoutManager::OnPreWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old_type) {
   aura::Window* window = window_state->window();
   if (IsPopupOrTransient(window))
     return;
   // The window property will still be set, but no actual change will occur
   // until OnFullscreenStateChange is called when exiting fullscreen.
   if (in_fullscreen_)
     return;
-  if (window_state->IsMinimized()) {
-    MinimizeDockedWindow(window_state);
-  } else if (window_state->IsMaximizedOrFullscreen() ||
-             window_state->IsSnapped()) {
+  if (!window_state->IsDocked() ||
+      window_state->IsMaximizedOrFullscreen() ||
+      window_state->IsSnapped()) {
     if (window != dragged_window_) {
       UndockWindow(window);
       RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);

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

I think we would need to record a new event source -
DOCKED_ACTION_SOURCE_KEYBOARD. Here and in other places where docking action may
be a result of a keyboard event. Maybe with an auto-reset that is armed when an
accelerator is dispatched.

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

I've adjusted the logic entry condition since the first state would imply the
next two always being true. And only record the uma action for what it was
originally intended for; the maximize. I presume the snap condition was added
when snap left/snap right was done. And those accelerators actions already are
logged via uma.

     }
-  } else if (old_type == wm::WINDOW_STATE_TYPE_MINIMIZED) {
+  } else if (window_state->IsMinimized()) {
+    MinimizeDockedWindow(window_state);
+  } else if (old_type == wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED) {
     RestoreDockedWindow(window_state);
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // DockedWindowLayoutManager, WindowObserver implementation:
 
 void DockedWindowLayoutManager::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
@@ skipping 483 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 ash