Remove docked windows entirely in M59.

ash/common/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/common/wm/window_state.h"
 
 #include <utility>
 
 #include "ash/common/wm/default_state.h"
 #include "ash/common/wm/window_positioning_utils.h"
@@ skipping 16 matching lines @@
       return WM_EVENT_NORMAL;
     case ui::SHOW_STATE_MINIMIZED:
       return WM_EVENT_MINIMIZE;
     case ui::SHOW_STATE_MAXIMIZED:
       return WM_EVENT_MAXIMIZE;
     case ui::SHOW_STATE_FULLSCREEN:
       return WM_EVENT_FULLSCREEN;
     case ui::SHOW_STATE_INACTIVE:
       return WM_EVENT_SHOW_INACTIVE;
 
-    // TODO(afakhry): Remove Docked Windows in M58.
-    case ui::SHOW_STATE_DOCKED:
-      return WM_EVENT_DOCK;
     case ui::SHOW_STATE_END:
       NOTREACHED() << "No WMEvent defined for the show state:"
                    << requested_show_state;
   }
   return WM_EVENT_NORMAL;
 }
 
 }  // namespace
 
 WindowState::~WindowState() {}
 
 bool WindowState::HasDelegate() const {
   return !!delegate_;
 }
 
 void WindowState::SetDelegate(std::unique_ptr<WindowStateDelegate> delegate) {
   DCHECK(!delegate_.get());
   delegate_ = std::move(delegate);
 }
 
 WindowStateType WindowState::GetStateType() const {
   return current_state_->GetType();
 }
 
 bool WindowState::IsMinimized() const {
-  return GetStateType() == WINDOW_STATE_TYPE_MINIMIZED ||
-         GetStateType() == WINDOW_STATE_TYPE_DOCKED_MINIMIZED;
+  return GetStateType() == WINDOW_STATE_TYPE_MINIMIZED;
 }
 
 bool WindowState::IsMaximized() const {
   return GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED;
 }
 
 bool WindowState::IsFullscreen() const {
   return GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN;
 }
 
@@ skipping 22 matching lines @@
 }
 
 bool WindowState::IsNormalOrSnapped() const {
   return IsNormalStateType() || IsSnapped();
 }
 
 bool WindowState::IsActive() const {
   return window_->IsActive();
 }
 
-bool WindowState::IsDocked() const {
-  return GetStateType() == WINDOW_STATE_TYPE_DOCKED ||
-         GetStateType() == WINDOW_STATE_TYPE_DOCKED_MINIMIZED;
-}
-
 bool WindowState::IsUserPositionable() const {
   return (window_->GetType() == ui::wm::WINDOW_TYPE_NORMAL ||
           window_->GetType() == ui::wm::WINDOW_TYPE_PANEL);
 }
 
 bool WindowState::CanMaximize() const {
   // Window must allow maximization and have no maximum width or height.
   if (!window_->CanMaximize())
     return false;
 
@@ skipping 268 matching lines @@
   if (!window_->GetTargetVisibility()) {
     SetBoundsConstrained(new_bounds);
     return;
   }
 
   window_->SetBoundsDirectCrossFade(new_bounds);
 }
 
 }  // namespace wm
 }  // namespace ash