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

ash/wm/dock/docked_window_layout_manager.cc

Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 14ccaa37329ea6a35b616c08f37d6c41097d51dd..048d04cda4d67b24d3f0f51d5454058678a815e9 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -815,15 +815,16 @@ void DockedWindowLayoutManager::OnPreWindowStateTypeChange(
   // 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);
   }
 }