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/display_manager.h" | 5 #include "ash/display/display_manager.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/screen_ash.h" | 8 #include "ash/screen_ash.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
11 #include "ash/test/display_manager_test_api.h" | 11 #include "ash/test/display_manager_test_api.h" |
12 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
13 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
15 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
16 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
17 #include "ui/gfx/display_observer.h" | 17 #include "ui/gfx/display_observer.h" |
18 #include "ui/gfx/display.h" | 18 #include "ui/gfx/display.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace internal { | 21 namespace internal { |
22 | 22 |
23 using std::vector; | 23 using std::vector; |
24 using std::string; | 24 using std::string; |
25 | 25 |
| 26 using base::StringPrintf; |
| 27 |
26 class DisplayManagerTest : public test::AshTestBase, | 28 class DisplayManagerTest : public test::AshTestBase, |
27 public gfx::DisplayObserver, | 29 public gfx::DisplayObserver, |
28 public aura::WindowObserver { | 30 public aura::WindowObserver { |
29 public: | 31 public: |
30 DisplayManagerTest() | 32 DisplayManagerTest() |
31 : removed_count_(0U), | 33 : removed_count_(0U), |
32 root_window_destroyed_(false) { | 34 root_window_destroyed_(false) { |
33 } | 35 } |
34 virtual ~DisplayManagerTest() {} | 36 virtual ~DisplayManagerTest() {} |
35 | 37 |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 GetDisplayInfoAt(0).size_in_pixel().ToString()); | 680 GetDisplayInfoAt(0).size_in_pixel().ToString()); |
679 | 681 |
680 EXPECT_EQ("1,201 300x400", | 682 EXPECT_EQ("1,201 300x400", |
681 GetDisplayInfoAt(1).bounds_in_pixel().ToString()); | 683 GetDisplayInfoAt(1).bounds_in_pixel().ToString()); |
682 EXPECT_EQ("300x400", | 684 EXPECT_EQ("300x400", |
683 GetDisplayInfoAt(1).size_in_pixel().ToString()); | 685 GetDisplayInfoAt(1).size_in_pixel().ToString()); |
684 } | 686 } |
685 | 687 |
686 } // namespace internal | 688 } // namespace internal |
687 } // namespace ash | 689 } // namespace ash |
OLD | NEW |