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

Unified Diff: ash/wm/drag_details.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: Pull forward a change from the dependant CL to this Created 6 years, 2 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/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/lock_window_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/drag_details.cc
diff --git a/ash/wm/drag_details.cc b/ash/wm/drag_details.cc
index e0ea7535871d7384166e9b4c570e57bbd565913b..67bbedc123fb1aa41b546728bd0821df115eca8d 100644
--- a/ash/wm/drag_details.cc
+++ b/ash/wm/drag_details.cc
@@ -62,7 +62,7 @@ DragDetails::DragDetails(aura::Window* window,
should_attach_to_shelf(window->type() == ui::wm::WINDOW_TYPE_PANEL &&
wm::GetWindowState(window)->panel_attached()) {
wm::WindowState* window_state = wm::GetWindowState(window);
- if (window_state->IsNormalOrSnapped() &&
+ if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) &&
window_state->HasRestoreBounds() &&
window_component == HTCAPTION) {
restore_bounds = window_state->GetRestoreBoundsInScreen();
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/lock_window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698