Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1175)

Unified Diff: ash/common/wm/window_state.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/window_state.h ('k') | ash/common/wm/window_state_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ash/common/wm/window_state.h ('k') | ash/common/wm/window_state_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698