Chromium Code Reviews| Index: ash/wm/workspace/workspace_window_resizer.cc |
| diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc |
| index ab5782a347c6afe9c06cd8cae5286db063e5e9a5..9f5f7c999f23726806a4f27a57e9870cfbcf021a 100644 |
| --- a/ash/wm/workspace/workspace_window_resizer.cc |
| +++ b/ash/wm/workspace/workspace_window_resizer.cc |
| @@ -36,6 +36,10 @@ scoped_ptr<WindowResizer> CreateWindowResizer(aura::Window* window, |
| const gfx::Point& point_in_parent, |
| int window_component) { |
| DCHECK(window); |
| + // No need to return a resizer when the window cannot get resized. |
| + if (!wm::CanResizeWindow(window)) |
|
sky
2012/11/13 17:01:54
Doesn't returning null here mean you can't drag fr
Mr4D (OOO till 08-26)
2012/11/13 21:27:23
The suggestion to do this came from you ( :) ) - b
|
| + return scoped_ptr<WindowResizer>(); |
| + |
| if (window->parent() && |
| window->parent()->id() == internal::kShellWindowId_WorkspaceContainer) { |
| // Allow dragging maximized windows if it's not tracked by workspace. This |
| @@ -286,8 +290,9 @@ void WorkspaceWindowResizer::Drag(const gfx::Point& location_in_parent, |
| wm::ConvertPointToScreen(window()->parent(), &location_in_screen); |
| const bool in_original_root = |
| wm::GetRootWindowAt(location_in_screen) == window()->GetRootWindow(); |
| + |
| // Hide a phantom window for snapping if the cursor is in another root window. |
| - if (in_original_root) { |
| + if (in_original_root && wm::CanResizeWindow(window())) { |
| UpdateSnapPhantomWindow(location_in_parent, bounds); |
| } else { |
| snap_type_ = SNAP_NONE; |