| 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 "ui/aura/test/test_screen.h" | 5 #include "ui/aura/test/test_screen.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
| 11 #include "ui/aura/window_tree_host.h" | 11 #include "ui/aura/window_tree_host.h" |
| 12 #include "ui/gfx/geometry/rect_conversions.h" |
| 12 #include "ui/gfx/geometry/size_conversions.h" | 13 #include "ui/gfx/geometry/size_conversions.h" |
| 13 #include "ui/gfx/native_widget_types.h" | 14 #include "ui/gfx/native_widget_types.h" |
| 14 #include "ui/gfx/rect_conversions.h" | |
| 15 #include "ui/gfx/screen.h" | 15 #include "ui/gfx/screen.h" |
| 16 | 16 |
| 17 namespace aura { | 17 namespace aura { |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 bool IsRotationPortrait(gfx::Display::Rotation rotation) { | 21 bool IsRotationPortrait(gfx::Display::Rotation rotation) { |
| 22 return rotation == gfx::Display::ROTATE_90 || | 22 return rotation == gfx::Display::ROTATE_90 || |
| 23 rotation == gfx::Display::ROTATE_270; | 23 rotation == gfx::Display::ROTATE_270; |
| 24 } | 24 } |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 166 |
| 167 TestScreen::TestScreen(const gfx::Rect& screen_bounds) | 167 TestScreen::TestScreen(const gfx::Rect& screen_bounds) |
| 168 : host_(NULL), | 168 : host_(NULL), |
| 169 ui_scale_(1.0f) { | 169 ui_scale_(1.0f) { |
| 170 static int64 synthesized_display_id = 2000; | 170 static int64 synthesized_display_id = 2000; |
| 171 display_.set_id(synthesized_display_id++); | 171 display_.set_id(synthesized_display_id++); |
| 172 display_.SetScaleAndBounds(1.0f, screen_bounds); | 172 display_.SetScaleAndBounds(1.0f, screen_bounds); |
| 173 } | 173 } |
| 174 | 174 |
| 175 } // namespace aura | 175 } // namespace aura |
| OLD | NEW |