| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_info.h" | 5 #include "ash/common/display/display_info.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 namespace { | 10 namespace { |
| 11 | 11 |
| 12 std::string GetModeSizeInDIP(const gfx::Size& size, | 12 std::string GetModeSizeInDIP(const gfx::Size& size, |
| 13 float device_scale_factor, | 13 float device_scale_factor, |
| 14 float ui_scale, | 14 float ui_scale, |
| 15 bool is_internal) { | 15 bool is_internal) { |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 EXPECT_EQ(11, info.input_devices()[1]); | 139 EXPECT_EQ(11, info.input_devices()[1]); |
| 140 | 140 |
| 141 DisplayInfo copy_info = DisplayInfo::CreateFromSpecWithID("200x100", 10); | 141 DisplayInfo copy_info = DisplayInfo::CreateFromSpecWithID("200x100", 10); |
| 142 copy_info.Copy(info); | 142 copy_info.Copy(info); |
| 143 EXPECT_EQ(2u, copy_info.input_devices().size()); | 143 EXPECT_EQ(2u, copy_info.input_devices().size()); |
| 144 copy_info.ClearInputDevices(); | 144 copy_info.ClearInputDevices(); |
| 145 EXPECT_EQ(0u, copy_info.input_devices().size()); | 145 EXPECT_EQ(0u, copy_info.input_devices().size()); |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace ash | 148 } // namespace ash |
| OLD | NEW |