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/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/shell_window_ids.h" | |
9 #include "ash/common/wm/window_positioning_utils.h" | 8 #include "ash/common/wm/window_positioning_utils.h" |
10 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
11 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
12 #include "ash/common/wm_window.h" | 11 #include "ash/common/wm_window.h" |
13 #include "ash/display/window_tree_host_manager.h" | 12 #include "ash/display/window_tree_host_manager.h" |
| 13 #include "ash/public/cpp/shell_window_ids.h" |
14 #include "ash/root_window_controller.h" | 14 #include "ash/root_window_controller.h" |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "ash/wm/window_properties.h" | 16 #include "ash/wm/window_properties.h" |
17 #include "ui/aura/client/capture_client.h" | 17 #include "ui/aura/client/capture_client.h" |
18 #include "ui/aura/client/focus_client.h" | 18 #include "ui/aura/client/focus_client.h" |
19 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
20 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
21 #include "ui/aura/window_tracker.h" | 21 #include "ui/aura/window_tracker.h" |
22 #include "ui/aura/window_tree_host.h" | 22 #include "ui/aura/window_tree_host.h" |
23 #include "ui/compositor/dip_util.h" | 23 #include "ui/compositor/dip_util.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 const display::Display& display) { | 121 const display::Display& display) { |
122 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { | 122 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { |
123 window->SetBounds(bounds); | 123 window->SetBounds(bounds); |
124 return; | 124 return; |
125 } | 125 } |
126 | 126 |
127 wm::SetBoundsInScreen(WmWindowAura::Get(window), bounds, display); | 127 wm::SetBoundsInScreen(WmWindowAura::Get(window), bounds, display); |
128 } | 128 } |
129 | 129 |
130 } // namespace ash | 130 } // namespace ash |
OLD | NEW |