Index: ash/common/wm/window_state.cc |
diff --git a/ash/common/wm/window_state.cc b/ash/common/wm/window_state.cc |
index fbfa9332336b03589426b8272f4b4455d18c1760..04f737ab16dce75e84a8f246341e97774589f8cb 100644 |
--- a/ash/common/wm/window_state.cc |
+++ b/ash/common/wm/window_state.cc |
@@ -34,9 +34,6 @@ WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { |
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; |
@@ -62,8 +59,7 @@ WindowStateType WindowState::GetStateType() const { |
} |
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 { |
@@ -106,11 +102,6 @@ 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); |