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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_port.h" | 10 #include "ash/shell_port.h" |
11 #include "ash/wm_window.h" | |
12 #include "base/logging.h" | 11 #include "base/logging.h" |
13 #include "ui/aura/client/screen_position_client.h" | 12 #include "ui/aura/client/screen_position_client.h" |
14 #include "ui/aura/window_event_dispatcher.h" | 13 #include "ui/aura/window_event_dispatcher.h" |
15 #include "ui/display/display.h" | 14 #include "ui/display/display.h" |
16 #include "ui/display/manager/display_manager.h" | 15 #include "ui/display/manager/display_manager.h" |
17 #include "ui/display/screen.h" | 16 #include "ui/display/screen.h" |
18 #include "ui/gfx/geometry/size_conversions.h" | 17 #include "ui/gfx/geometry/size_conversions.h" |
19 #include "ui/wm/core/coordinate_conversion.h" | 18 #include "ui/wm/core/coordinate_conversion.h" |
20 | 19 |
21 namespace ash { | 20 namespace ash { |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size()); | 58 gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size()); |
60 float scale = window->GetRootWindow()->bounds().height() / size.height(); | 59 float scale = window->GetRootWindow()->bounds().height() / size.height(); |
61 size.Scale(scale, scale); | 60 size.Scale(scale, scale); |
62 return gfx::Rect(gfx::ToCeiledSize(size)); | 61 return gfx::Rect(gfx::ToCeiledSize(size)); |
63 } | 62 } |
64 | 63 |
65 return window->GetRootWindow()->bounds(); | 64 return window->GetRootWindow()->bounds(); |
66 } | 65 } |
67 | 66 |
68 } // namespace ash | 67 } // namespace ash |
OLD | NEW |