| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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_change_observer_chromeos.h" | 5 #include "ash/display/display_change_observer_chromeos.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 #include "ui/display/chromeos/display_configurator.h" | |
| 10 #include "ui/display/fake_display_snapshot.h" | 9 #include "ui/display/fake_display_snapshot.h" |
| 10 #include "ui/display/manager/chromeos/display_configurator.h" |
| 11 #include "ui/display/manager/managed_display_info.h" | 11 #include "ui/display/manager/managed_display_info.h" |
| 12 #include "ui/display/types/display_mode.h" | 12 #include "ui/display/types/display_mode.h" |
| 13 | 13 |
| 14 using ui::DisplayConfigurator; | 14 using ui::DisplayConfigurator; |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 float ComputeDeviceScaleFactor(float diagonal_inch, | 20 float ComputeDeviceScaleFactor(float diagonal_inch, |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 EXPECT_FALSE(display_modes[0]->native()); | 363 EXPECT_FALSE(display_modes[0]->native()); |
| 364 EXPECT_EQ(display_modes[0]->refresh_rate(), 60); | 364 EXPECT_EQ(display_modes[0]->refresh_rate(), 60); |
| 365 | 365 |
| 366 EXPECT_EQ("1920x1080", display_modes[1]->size().ToString()); | 366 EXPECT_EQ("1920x1080", display_modes[1]->size().ToString()); |
| 367 EXPECT_TRUE(display_modes[1]->is_interlaced()); | 367 EXPECT_TRUE(display_modes[1]->is_interlaced()); |
| 368 EXPECT_TRUE(display_modes[1]->native()); | 368 EXPECT_TRUE(display_modes[1]->native()); |
| 369 EXPECT_EQ(display_modes[1]->refresh_rate(), 60); | 369 EXPECT_EQ(display_modes[1]->refresh_rate(), 60); |
| 370 } | 370 } |
| 371 | 371 |
| 372 } // namespace ash | 372 } // namespace ash |
| OLD | NEW |