OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/screen_util.h" | 5 #include "ash/screen_util.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf.h" | |
8 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/wm_shelf.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "ui/aura/client/screen_position_client.h" | 11 #include "ui/aura/client/screen_position_client.h" |
12 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
13 #include "ui/display/display.h" | 13 #include "ui/display/display.h" |
14 #include "ui/display/manager/display_manager.h" | 14 #include "ui/display/manager/display_manager.h" |
15 #include "ui/display/screen.h" | 15 #include "ui/display/screen.h" |
16 #include "ui/gfx/geometry/size_conversions.h" | 16 #include "ui/gfx/geometry/size_conversions.h" |
17 #include "ui/wm/core/coordinate_conversion.h" | 17 #include "ui/wm/core/coordinate_conversion.h" |
18 | 18 |
(...skipping 18 matching lines...) Expand all Loading... |
37 | 37 |
38 // static | 38 // static |
39 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) { | 39 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) { |
40 gfx::Rect result = | 40 gfx::Rect result = |
41 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); | 41 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); |
42 ::wm::ConvertRectFromScreen(window->parent(), &result); | 42 ::wm::ConvertRectFromScreen(window->parent(), &result); |
43 return result; | 43 return result; |
44 } | 44 } |
45 | 45 |
46 } // namespace ash | 46 } // namespace ash |
OLD | NEW |