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

Unified Diff: ash/wm/dock/docked_window_layout_manager.cc

Issue 597683003: Add window states docked; and docked minimized. Add wm window event to set docked and undocked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dock
Patch Set: Created 6 years, 3 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
Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 71316611fa93b1e92f884833680b1c3063375b7d..4e50ccfbacff55d294e24fe524971937b9b92483 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -826,15 +826,16 @@ void DockedWindowLayoutManager::OnPreWindowStateTypeChange(
// until OnFullscreenStateChange is called when exiting fullscreen.
if (in_fullscreen_)
return;
- if (window_state->IsMinimized()) {
- MinimizeDockedWindow(window_state);
- } else if (window_state->IsMaximizedOrFullscreen() ||
- window_state->IsSnapped()) {
+ if (!window_state->IsDocked() ||
+ window_state->IsMaximizedOrFullscreen() ||
+ window_state->IsSnapped()) {
if (window != dragged_window_) {
UndockWindow(window);
RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
}
- } else if (old_type == wm::WINDOW_STATE_TYPE_MINIMIZED) {
+ } else if (window_state->IsMinimized()) {
+ MinimizeDockedWindow(window_state);
+ } else if (old_type == wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED) {
varkha 2014/09/23 22:35:31 Maybe add NOTREACHED for WINDOW_STATE_TYPE_MINIMIZ
dtapuska 2014/09/26 14:17:07 Done.
RestoreDockedWindow(window_state);
}
}

Powered by Google App Engine
This is Rietveld 408576698