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/display/screen_position_controller.h" | 5 #include "ash/display/screen_position_controller.h" |
6 | 6 |
| 7 #include "ash/common/shell_window_ids.h" |
7 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
8 #include "ash/display/window_tree_host_manager.h" | 9 #include "ash/display/window_tree_host_manager.h" |
9 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
10 #include "ash/shell.h" | 11 #include "ash/shell.h" |
11 #include "ash/shell_window_ids.h" | |
12 #include "ash/wm/system_modal_container_layout_manager.h" | 12 #include "ash/wm/system_modal_container_layout_manager.h" |
13 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" |
14 #include "ui/aura/client/capture_client.h" | 14 #include "ui/aura/client/capture_client.h" |
15 #include "ui/aura/client/focus_client.h" | 15 #include "ui/aura/client/focus_client.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_event_dispatcher.h" | 17 #include "ui/aura/window_event_dispatcher.h" |
18 #include "ui/aura/window_tracker.h" | 18 #include "ui/aura/window_tracker.h" |
19 #include "ui/aura/window_tree_host.h" | 19 #include "ui/aura/window_tree_host.h" |
20 #include "ui/compositor/dip_util.h" | 20 #include "ui/compositor/dip_util.h" |
21 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 gfx::Point origin(bounds.origin()); | 229 gfx::Point origin(bounds.origin()); |
230 const gfx::Point display_origin = display::Screen::GetScreen() | 230 const gfx::Point display_origin = display::Screen::GetScreen() |
231 ->GetDisplayNearestWindow(window) | 231 ->GetDisplayNearestWindow(window) |
232 .bounds() | 232 .bounds() |
233 .origin(); | 233 .origin(); |
234 origin.Offset(-display_origin.x(), -display_origin.y()); | 234 origin.Offset(-display_origin.x(), -display_origin.y()); |
235 window->SetBounds(gfx::Rect(origin, bounds.size())); | 235 window->SetBounds(gfx::Rect(origin, bounds.size())); |
236 } | 236 } |
237 | 237 |
238 } // namespace ash | 238 } // namespace ash |
OLD | NEW |