| 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/wm/window_positioning_utils.h" | |
| 8 #include "ash/common/wm/window_state.h" | |
| 9 #include "ash/common/wm_shell.h" | |
| 10 #include "ash/common/wm_window.h" | |
| 11 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 12 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/window_positioning_utils.h" |
| 13 #include "ash/wm/window_properties.h" | 10 #include "ash/wm/window_properties.h" |
| 11 #include "ash/wm/window_state.h" |
| 12 #include "ash/wm_shell.h" |
| 13 #include "ash/wm_window.h" |
| 14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 15 #include "ui/aura/window_tree_host.h" | 15 #include "ui/aura/window_tree_host.h" |
| 16 #include "ui/compositor/dip_util.h" | 16 #include "ui/compositor/dip_util.h" |
| 17 #include "ui/display/display.h" | 17 #include "ui/display/display.h" |
| 18 #include "ui/display/screen.h" | 18 #include "ui/display/screen.h" |
| 19 #include "ui/wm/core/window_util.h" | 19 #include "ui/wm/core/window_util.h" |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 | 22 |
| 23 // static | 23 // static |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 const display::Display& display) { | 114 const display::Display& display) { |
| 115 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { | 115 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { |
| 116 window->SetBounds(bounds); | 116 window->SetBounds(bounds); |
| 117 return; | 117 return; |
| 118 } | 118 } |
| 119 | 119 |
| 120 wm::SetBoundsInScreen(WmWindow::Get(window), bounds, display); | 120 wm::SetBoundsInScreen(WmWindow::Get(window), bounds, display); |
| 121 } | 121 } |
| 122 | 122 |
| 123 } // namespace ash | 123 } // namespace ash |
| OLD | NEW |