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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 if (!details_.restore_bounds.IsEmpty()) | 387 if (!details_.restore_bounds.IsEmpty()) |
388 window_state()->ClearRestoreBounds(); | 388 window_state()->ClearRestoreBounds(); |
389 RestackWindows(); | 389 RestackWindows(); |
390 } | 390 } |
391 did_move_or_resize_ = true; | 391 did_move_or_resize_ = true; |
392 } | 392 } |
393 | 393 |
394 gfx::Point location_in_screen = location_in_parent; | 394 gfx::Point location_in_screen = location_in_parent; |
395 wm::ConvertPointToScreen(window()->parent(), &location_in_screen); | 395 wm::ConvertPointToScreen(window()->parent(), &location_in_screen); |
396 | 396 |
397 aura::RootWindow* root = NULL; | 397 aura::Window* root = NULL; |
398 gfx::Display display = | 398 gfx::Display display = |
399 ScreenAsh::FindDisplayContainingPoint(location_in_screen); | 399 ScreenAsh::FindDisplayContainingPoint(location_in_screen); |
400 // Track the last screen that the pointer was on to keep the snap phantom | 400 // Track the last screen that the pointer was on to keep the snap phantom |
401 // window there. | 401 // window there. |
402 if (display.is_valid()) { | 402 if (display.is_valid()) { |
403 root = Shell::GetInstance()->display_controller()-> | 403 root = Shell::GetInstance()->display_controller()-> |
404 GetRootWindowForDisplayId(display.id()); | 404 GetRootWindowForDisplayId(display.id()); |
405 } | 405 } |
406 if (!attached_windows_.empty()) | 406 if (!attached_windows_.empty()) |
407 LayoutAttachedWindows(&bounds); | 407 LayoutAttachedWindows(&bounds); |
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1008 if (!dock_layout_->is_dragged_window_docked()) | 1008 if (!dock_layout_->is_dragged_window_docked()) |
1009 dock_layout_->DockDraggedWindow(window()); | 1009 dock_layout_->DockDraggedWindow(window()); |
1010 } else { | 1010 } else { |
1011 if (dock_layout_->is_dragged_window_docked()) | 1011 if (dock_layout_->is_dragged_window_docked()) |
1012 dock_layout_->UndockDraggedWindow(); | 1012 dock_layout_->UndockDraggedWindow(); |
1013 } | 1013 } |
1014 } | 1014 } |
1015 | 1015 |
1016 } // namespace internal | 1016 } // namespace internal |
1017 } // namespace ash | 1017 } // namespace ash |
OLD | NEW |