Chromium Code Reviews| Index: ash/wm/workspace/multi_window_resize_controller.cc |
| diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc |
| index 3a330aa2ca69a6d5f5618cc6f2f7c0bdec020bd4..c9cd180266a7f7ef53eccda547511f7ae3a83cbf 100644 |
| --- a/ash/wm/workspace/multi_window_resize_controller.cc |
| +++ b/ash/wm/workspace/multi_window_resize_controller.cc |
| @@ -9,6 +9,7 @@ |
| #include "ash/shell_window_ids.h" |
| #include "ash/wm/coordinate_conversion.h" |
| #include "ash/wm/window_animations.h" |
| +#include "ash/wm/window_util.h" |
| #include "ash/wm/workspace/workspace_event_handler.h" |
| #include "ash/wm/workspace/workspace_window_resizer.h" |
| #include "grit/ash_resources.h" |
| @@ -286,7 +287,8 @@ Window* MultiWindowResizeController::FindWindowByEdge( |
| for (Window::Windows::const_reverse_iterator i = windows.rbegin(); |
| i != windows.rend(); ++i) { |
| Window* window = *i; |
| - if (window == window_to_ignore || !window->IsVisible()) |
| + if (window == window_to_ignore || !window->IsVisible() || |
| + !wm::CanResizeWindow(window)) |
|
sky
2012/11/13 17:01:54
The multi-window resizer may just move the other w
Mr4D (OOO till 08-26)
2012/11/13 21:27:23
After investigating I have figured out that the fr
|
| continue; |
| switch (edge_want) { |
| case HTLEFT: |
| @@ -326,7 +328,7 @@ aura::Window* MultiWindowResizeController::FindWindowTouching( |
| for (Window::Windows::const_reverse_iterator i = windows.rbegin(); |
| i != windows.rend(); ++i) { |
| Window* other = *i; |
| - if (other == window || !other->IsVisible()) |
| + if (other == window || !other->IsVisible() || !wm::CanResizeWindow(other)) |
| continue; |
| switch (direction) { |
| case TOP_BOTTOM: |