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/size_conversions.h" | 12 #include "ui/gfx/geometry/size_conversions.h" |
13 #include "ui/gfx/native_widget_types.h" | 13 #include "ui/gfx/native_widget_types.h" |
14 #include "ui/gfx/rect_conversions.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 // static | 19 // static |
20 TestScreen* TestScreen::Create() { | 20 TestScreen* TestScreen::Create(const gfx::Size& size) { |
| 21 const gfx::Size kDefaultSize(800, 600); |
21 // Use (0,0) because the desktop aura tests are executed in | 22 // Use (0,0) because the desktop aura tests are executed in |
22 // native environment where the display's origin is (0,0). | 23 // native environment where the display's origin is (0,0). |
23 return new TestScreen(gfx::Rect(0, 0, 800, 600)); | 24 return new TestScreen(gfx::Rect(size.IsEmpty() ? kDefaultSize : size)); |
24 } | 25 } |
25 | 26 |
26 // static | 27 // static |
27 TestScreen* TestScreen::CreateFullscreen() { | 28 TestScreen* TestScreen::CreateFullscreen() { |
28 return new TestScreen(gfx::Rect(WindowTreeHost::GetNativeScreenSize())); | 29 return new TestScreen(gfx::Rect(WindowTreeHost::GetNativeScreenSize())); |
29 } | 30 } |
30 | 31 |
31 TestScreen::~TestScreen() { | 32 TestScreen::~TestScreen() { |
32 } | 33 } |
33 | 34 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 | 152 |
152 TestScreen::TestScreen(const gfx::Rect& screen_bounds) | 153 TestScreen::TestScreen(const gfx::Rect& screen_bounds) |
153 : host_(NULL), | 154 : host_(NULL), |
154 ui_scale_(1.0f) { | 155 ui_scale_(1.0f) { |
155 static int64 synthesized_display_id = 2000; | 156 static int64 synthesized_display_id = 2000; |
156 display_.set_id(synthesized_display_id++); | 157 display_.set_id(synthesized_display_id++); |
157 display_.SetScaleAndBounds(1.0f, screen_bounds); | 158 display_.SetScaleAndBounds(1.0f, screen_bounds); |
158 } | 159 } |
159 | 160 |
160 } // namespace aura | 161 } // namespace aura |
OLD | NEW |