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

ash/wm/window_state.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/window_state.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell_window_ids.h"
@@ skipping 83 matching lines @@
 void WindowState::SetDelegate(scoped_ptr<WindowStateDelegate> delegate) {
   DCHECK(!delegate_.get());
   delegate_ = delegate.Pass();
 }
 
 WindowStateType WindowState::GetStateType() const {
   return current_state_->GetType();
 }
 
 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 {
   return GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED;
 }
 
 bool WindowState::IsFullscreen() const {
   return GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN;
 }
 
 bool WindowState::IsMaximizedOrFullscreen() const {
   return GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN ||
       GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED;
 }
 
 bool WindowState::IsSnapped() const {
   return GetStateType() == WINDOW_STATE_TYPE_LEFT_SNAPPED ||
       GetStateType() == WINDOW_STATE_TYPE_RIGHT_SNAPPED;
 }
 
 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 {
   return IsActiveWindow(window_);
 }
 
 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 {
   return window_->GetProperty(aura::client::kCanMaximizeKey);
 }
 
 bool WindowState::CanMinimize() const {
   RootWindowController* controller = RootWindowController::ForWindow(window_);
   if (!controller)
     return false;
@@ skipping 299 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash