| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/workspace/workspace_window_resizer.h" | 5 #include "ash/wm/workspace/workspace_window_resizer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 if (!details_.restore_bounds.IsEmpty()) | 383 if (!details_.restore_bounds.IsEmpty()) |
| 384 window_state()->ClearRestoreBounds(); | 384 window_state()->ClearRestoreBounds(); |
| 385 RestackWindows(); | 385 RestackWindows(); |
| 386 } | 386 } |
| 387 did_move_or_resize_ = true; | 387 did_move_or_resize_ = true; |
| 388 } | 388 } |
| 389 | 389 |
| 390 gfx::Point location_in_screen = location_in_parent; | 390 gfx::Point location_in_screen = location_in_parent; |
| 391 wm::ConvertPointToScreen(window()->parent(), &location_in_screen); | 391 wm::ConvertPointToScreen(window()->parent(), &location_in_screen); |
| 392 | 392 |
| 393 aura::RootWindow* root = NULL; | 393 aura::Window* root = NULL; |
| 394 gfx::Display display = | 394 gfx::Display display = |
| 395 ScreenAsh::FindDisplayContainingPoint(location_in_screen); | 395 ScreenAsh::FindDisplayContainingPoint(location_in_screen); |
| 396 // Track the last screen that the pointer was on to keep the snap phantom | 396 // Track the last screen that the pointer was on to keep the snap phantom |
| 397 // window there. | 397 // window there. |
| 398 if (display.is_valid()) { | 398 if (display.is_valid()) { |
| 399 root = Shell::GetInstance()->display_controller()-> | 399 root = Shell::GetInstance()->display_controller()-> |
| 400 GetRootWindowForDisplayId(display.id()); | 400 GetRootWindowForDisplayId(display.id()); |
| 401 } | 401 } |
| 402 if (!attached_windows_.empty()) | 402 if (!attached_windows_.empty()) |
| 403 LayoutAttachedWindows(&bounds); | 403 LayoutAttachedWindows(&bounds); |
| (...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 if (!dock_layout_->is_dragged_window_docked()) | 1004 if (!dock_layout_->is_dragged_window_docked()) |
| 1005 dock_layout_->DockDraggedWindow(window()); | 1005 dock_layout_->DockDraggedWindow(window()); |
| 1006 } else { | 1006 } else { |
| 1007 if (dock_layout_->is_dragged_window_docked()) | 1007 if (dock_layout_->is_dragged_window_docked()) |
| 1008 dock_layout_->UndockDraggedWindow(); | 1008 dock_layout_->UndockDraggedWindow(); |
| 1009 } | 1009 } |
| 1010 } | 1010 } |
| 1011 | 1011 |
| 1012 } // namespace internal | 1012 } // namespace internal |
| 1013 } // namespace ash | 1013 } // namespace ash |
| OLD | NEW |