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

ash/wm/window_state.cc

Index: ash/wm/window_state.cc
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index e60dc34fceb106f39fdc74e3ddf3639b73bf1c9c..d6f304da6209cd82a5306802e2b9adad5d01d737 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -101,7 +101,8 @@ WindowStateType WindowState::GetStateType() const {
 }
 
 bool WindowState::IsMinimized() const {
-  return GetStateType() == WINDOW_STATE_TYPE_MINIMIZED;
+  return GetStateType() == WINDOW_STATE_TYPE_MINIMIZED ||
+         GetStateType() == WINDOW_STATE_TYPE_DOCKED_MINIMIZED;
 }
 
 bool WindowState::IsMaximized() const {
@@ -124,11 +125,13 @@ bool WindowState::IsSnapped() const {
 
 bool WindowState::IsNormalStateType() const {
   return GetStateType() == WINDOW_STATE_TYPE_NORMAL ||
-      GetStateType() == WINDOW_STATE_TYPE_DEFAULT;
+      GetStateType() == WINDOW_STATE_TYPE_DEFAULT ||
+      GetStateType() == WINDOW_STATE_TYPE_DOCKED;

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

This may make the code simpler elsewhere but may be confusing nonetheless.
Consider IsRestored or something like that (since
IsNormalOrDockedButNotDockedMinimized would be too long).

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

Done.

 }
 
 bool WindowState::IsNormalOrSnapped() const {
-  return IsNormalStateType() || IsSnapped();
+  return IsNormalStateType() || IsSnapped() ||
+         GetStateType() == WINDOW_STATE_TYPE_DOCKED;

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

Is this necessary given that DOCKED is a Normal state?

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

No it isn't needed

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

Done.

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

Done.

 }
 
 bool WindowState::IsActive() const {
@@ -136,8 +139,8 @@ bool WindowState::IsActive() const {
 }
 
 bool WindowState::IsDocked() const {
-  return window_->parent() &&
-         window_->parent()->id() == kShellWindowId_DockedContainer;
+  return GetStateType() == WINDOW_STATE_TYPE_DOCKED ||
+         GetStateType() == WINDOW_STATE_TYPE_DOCKED_MINIMIZED;
 }
 
 bool WindowState::CanMaximize() const {