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/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
11 #include "ash/wm/coordinate_conversion.h" | 11 #include "ash/wm/coordinate_conversion.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 "ash/wm/window_state.h" | 14 #include "ash/wm/window_state.h" |
15 #include "ui/aura/client/activation_client.h" | 15 #include "ui/aura/client/activation_client.h" |
16 #include "ui/aura/client/capture_client.h" | 16 #include "ui/aura/client/capture_client.h" |
17 #include "ui/aura/client/focus_client.h" | 17 #include "ui/aura/client/focus_client.h" |
18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
19 #include "ui/aura/window_tracker.h" | 19 #include "ui/aura/window_tracker.h" |
20 #include "ui/compositor/dip_util.h" | 20 #include "ui/compositor/dip_util.h" |
21 #include "ui/gfx/display.h" | 21 #include "ui/gfx/display.h" |
22 #include "ui/gfx/screen.h" | 22 #include "ui/gfx/screen.h" |
23 #include "ui/views/corewm/window_util.h" | 23 #include "ui/wm/core/window_util.h" |
24 | 24 |
25 namespace ash { | 25 namespace ash { |
26 namespace { | 26 namespace { |
27 | 27 |
28 // Return true if the window or its ancestor has |kStayInSameRootWindowkey| | 28 // Return true if the window or its ancestor has |kStayInSameRootWindowkey| |
29 // property. | 29 // property. |
30 bool ShouldStayInSameRootWindow(const aura::Window* window) { | 30 bool ShouldStayInSameRootWindow(const aura::Window* window) { |
31 return window && | 31 return window && |
32 (window->GetProperty(internal::kStayInSameRootWindowKey) || | 32 (window->GetProperty(internal::kStayInSameRootWindowKey) || |
33 ShouldStayInSameRootWindow(window->parent())); | 33 ShouldStayInSameRootWindow(window->parent())); |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 } | 223 } |
224 gfx::Point origin(bounds.origin()); | 224 gfx::Point origin(bounds.origin()); |
225 const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow( | 225 const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow( |
226 window).bounds().origin(); | 226 window).bounds().origin(); |
227 origin.Offset(-display_origin.x(), -display_origin.y()); | 227 origin.Offset(-display_origin.x(), -display_origin.y()); |
228 window->SetBounds(gfx::Rect(origin, bounds.size())); | 228 window->SetBounds(gfx::Rect(origin, bounds.size())); |
229 } | 229 } |
230 | 230 |
231 } // internal | 231 } // internal |
232 } // ash | 232 } // ash |
OLD | NEW |