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 "extensions/browser/api/system_display/display_info_provider.h" | 5 #include "extensions/browser/api/system_display/display_info_provider.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
12 #include "ash/test/display_manager_test_api.h" | 12 #include "ash/test/display_manager_test_api.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
15 #include "extensions/common/api/system_display.h" | 15 #include "extensions/common/api/system_display.h" |
16 #include "ui/gfx/display.h" | 16 #include "ui/gfx/display.h" |
17 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/geometry/rect.h" |
18 | 18 |
19 namespace extensions { | 19 namespace extensions { |
20 namespace { | 20 namespace { |
21 | 21 |
22 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase { | 22 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase { |
23 public: | 23 public: |
24 DisplayInfoProviderChromeosTest() {} | 24 DisplayInfoProviderChromeosTest() {} |
25 | 25 |
26 virtual ~DisplayInfoProviderChromeosTest() {} | 26 virtual ~DisplayInfoProviderChromeosTest() {} |
27 | 27 |
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
882 std::string error; | 882 std::string error; |
883 CallSetDisplayUnitInfo( | 883 CallSetDisplayUnitInfo( |
884 base::Int64ToString(internal_display_id), info, &success, &error); | 884 base::Int64ToString(internal_display_id), info, &success, &error); |
885 | 885 |
886 ASSERT_FALSE(success); | 886 ASSERT_FALSE(success); |
887 EXPECT_EQ("Overscan changes not allowed for the internal monitor.", error); | 887 EXPECT_EQ("Overscan changes not allowed for the internal monitor.", error); |
888 } | 888 } |
889 | 889 |
890 } // namespace | 890 } // namespace |
891 } // namespace extensions | 891 } // namespace extensions |
OLD | NEW |