Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7652)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2196923002: Make ash::DisplayMode more like ui::DisplayMode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/accelerators/accelerator_commands_aura.cc ('K') | « ash/display/display_manager.cc ('k') | ash/display/display_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 252930de62abbe818b2a7c205c58be6516ab35b7..b146ff01ff24d93e7e83d58b5d63a6b68eb43d28 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -904,13 +904,13 @@ TEST_P(DisplayManagerTest, DontRememberBestResolution) {
int display_id = 1000;
DisplayInfo native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
- std::vector<DisplayMode> display_modes;
- display_modes.push_back(
- DisplayMode(gfx::Size(1000, 500), 58.0f, false, true));
- display_modes.push_back(
- DisplayMode(gfx::Size(800, 300), 59.0f, false, false));
- display_modes.push_back(
- DisplayMode(gfx::Size(400, 500), 60.0f, false, false));
+ DisplayInfo::DisplayModeList display_modes;
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(1000, 500), 58.0f, false, true)));
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(800, 300), 59.0f, false, false)));
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(400, 500), 60.0f, false, false)));
native_display_info.SetDisplayModes(display_modes);
@@ -918,41 +918,46 @@ TEST_P(DisplayManagerTest, DontRememberBestResolution) {
display_info_list.push_back(native_display_info);
display_manager()->OnNativeDisplaysChanged(display_info_list);
- DisplayMode mode;
- DisplayMode expected_mode;
- expected_mode.size = gfx::Size(1000, 500);
- EXPECT_FALSE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ scoped_refptr<DisplayMode> mode;
+ scoped_refptr<DisplayMode> expected_mode(
+ new DisplayMode(gfx::Size(1000, 500), 0.0f, false, false));
+
+ mode = display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_FALSE(!!mode);
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
// Unsupported resolution.
test::SetDisplayResolution(display_id, gfx::Size(800, 4000));
- EXPECT_FALSE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ mode = display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_FALSE(!!mode);
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
// Supported resolution.
test::SetDisplayResolution(display_id, gfx::Size(800, 300));
- EXPECT_TRUE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_EQ("800x300", mode.size.ToString());
- EXPECT_EQ(59.0f, mode.refresh_rate);
- EXPECT_FALSE(mode.native);
- expected_mode.size = gfx::Size(800, 300);
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ mode = display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_TRUE(!!mode);
+ EXPECT_EQ("800x300", mode->size().ToString());
+ EXPECT_EQ(59.0f, mode->refresh_rate());
+ EXPECT_FALSE(mode->native());
+
+ expected_mode = new DisplayMode(gfx::Size(800, 300), 0.0f, false, false);
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
// Best resolution.
test::SetDisplayResolution(display_id, gfx::Size(1000, 500));
- EXPECT_TRUE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_EQ("1000x500", mode.size.ToString());
- EXPECT_EQ(58.0f, mode.refresh_rate);
- EXPECT_TRUE(mode.native);
- expected_mode.size = gfx::Size(1000, 500);
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ mode = display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_TRUE(!!mode);
+ EXPECT_EQ("1000x500", mode->size().ToString());
+ EXPECT_EQ(58.0f, mode->refresh_rate());
+ EXPECT_TRUE(mode->native());
+
+ expected_mode = new DisplayMode(gfx::Size(1000, 500), 0.0f, false, false);
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
}
#endif // defined(OS_CHROMEOS)
@@ -963,15 +968,15 @@ TEST_P(DisplayManagerTest, ResolutionFallback) {
int display_id = 1000;
DisplayInfo native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
- std::vector<DisplayMode> display_modes;
- display_modes.push_back(
- DisplayMode(gfx::Size(1000, 500), 58.0f, false, true));
- display_modes.push_back(
- DisplayMode(gfx::Size(800, 300), 59.0f, false, false));
- display_modes.push_back(
- DisplayMode(gfx::Size(400, 500), 60.0f, false, false));
-
- std::vector<DisplayMode> copy = display_modes;
+ DisplayInfo::DisplayModeList display_modes;
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(1000, 500), 58.0f, false, true)));
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(800, 300), 59.0f, false, false)));
+ display_modes.push_back(make_scoped_refptr(
+ new DisplayMode(gfx::Size(400, 500), 60.0f, false, false)));
+
+ DisplayInfo::DisplayModeList copy = display_modes;
native_display_info.SetDisplayModes(copy);
std::vector<DisplayInfo> display_info_list;
@@ -987,30 +992,30 @@ TEST_P(DisplayManagerTest, ResolutionFallback) {
new_display_info_list.push_back(new_native_display_info);
display_manager()->OnNativeDisplaysChanged(new_display_info_list);
- DisplayMode mode;
- EXPECT_TRUE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_EQ("400x500", mode.size.ToString());
- EXPECT_EQ(60.0f, mode.refresh_rate);
- EXPECT_FALSE(mode.native);
+ scoped_refptr<DisplayMode> mode =
+ display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_TRUE(!!mode);
+ EXPECT_EQ("400x500", mode->size().ToString());
+ EXPECT_EQ(60.0f, mode->refresh_rate());
+ EXPECT_FALSE(mode->native());
}
{
// Best resolution should find itself on the resolutions list.
test::SetDisplayResolution(display_id, gfx::Size(800, 300));
DisplayInfo new_native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
- std::vector<DisplayMode> copy = display_modes;
+ DisplayInfo::DisplayModeList copy = display_modes;
new_native_display_info.SetDisplayModes(copy);
std::vector<DisplayInfo> new_display_info_list;
new_display_info_list.push_back(new_native_display_info);
display_manager()->OnNativeDisplaysChanged(new_display_info_list);
- DisplayMode mode;
- EXPECT_TRUE(
- display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
- EXPECT_EQ("1000x500", mode.size.ToString());
- EXPECT_EQ(58.0f, mode.refresh_rate);
- EXPECT_TRUE(mode.native);
+ scoped_refptr<DisplayMode> mode =
+ display_manager()->GetSelectedModeForDisplayId(display_id);
+ EXPECT_TRUE(!!mode);
+ EXPECT_EQ("1000x500", mode->size().ToString());
+ EXPECT_EQ(58.0f, mode->refresh_rate());
+ EXPECT_TRUE(mode->native());
}
}
#endif // defined(OS_CHROMEOS)
@@ -1202,55 +1207,77 @@ TEST_P(DisplayManagerTest, UIScaleWithDisplayMode) {
// Setup the display modes with UI-scale.
DisplayInfo native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1280, 800));
- const DisplayMode base_mode(gfx::Size(1280, 800), 60.0f, false, false);
- std::vector<DisplayMode> mode_list = CreateInternalDisplayModeList(base_mode);
+ const scoped_refptr<DisplayMode>& base_mode(
+ new DisplayMode(gfx::Size(1280, 800), 60.0f, false, false));
+ DisplayInfo::DisplayModeList mode_list =
+ CreateInternalDisplayModeList(base_mode);
native_display_info.SetDisplayModes(mode_list);
std::vector<DisplayInfo> display_info_list;
display_info_list.push_back(native_display_info);
display_manager()->OnNativeDisplaysChanged(display_info_list);
- DisplayMode expected_mode = base_mode;
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ scoped_refptr<DisplayMode> expected_mode = base_mode;
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
test::ScopedSetInternalDisplayId set_internal(display_id);
SetDisplayUIScale(display_id, 1.5f);
EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 1.25f);
EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 1.125f);
EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
- expected_mode.ui_scale = 1.125f;
- EXPECT_TRUE(expected_mode.IsEquivalent(
+
+ expected_mode = new DisplayMode(
+ expected_mode->size(), expected_mode->refresh_rate(),
+ expected_mode->is_interlaced(), expected_mode->native(),
+ 1.125f /* ui_scale */, expected_mode->device_scale_factor());
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 0.8f);
EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
- expected_mode.ui_scale = 0.8f;
- EXPECT_TRUE(expected_mode.IsEquivalent(
+
+ expected_mode = new DisplayMode(
+ expected_mode->size(), expected_mode->refresh_rate(),
+ expected_mode->is_interlaced(), expected_mode->native(),
+ 0.8f /* ui_scale */, expected_mode->device_scale_factor());
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 0.75f);
EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 0.625f);
EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
- expected_mode.ui_scale = 0.625f;
- EXPECT_TRUE(expected_mode.IsEquivalent(
+
+ expected_mode = new DisplayMode(
+ expected_mode->size(), expected_mode->refresh_rate(),
+ expected_mode->is_interlaced(), expected_mode->native(),
+ 0.625f /* ui_scale */, expected_mode->device_scale_factor());
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 0.6f);
EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
- EXPECT_TRUE(expected_mode.IsEquivalent(
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
SetDisplayUIScale(display_id, 0.5f);
EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
- expected_mode.ui_scale = 0.5f;
- EXPECT_TRUE(expected_mode.IsEquivalent(
+
+ expected_mode = new DisplayMode(
+ expected_mode->size(), expected_mode->refresh_rate(),
+ expected_mode->is_interlaced(), expected_mode->native(),
+ 0.5f /* ui_scale */, expected_mode->device_scale_factor());
+
+ EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
}
@@ -1294,8 +1321,10 @@ TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScaling) {
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1920, 1080));
native_display_info.set_device_scale_factor(1.25);
- const DisplayMode base_mode(gfx::Size(1920, 1080), 60.0f, false, false);
- std::vector<DisplayMode> mode_list = CreateInternalDisplayModeList(base_mode);
+ const scoped_refptr<DisplayMode>& base_mode(
+ new DisplayMode(gfx::Size(1920, 1080), 60.0f, false, false));
+ DisplayInfo::DisplayModeList mode_list =
+ CreateInternalDisplayModeList(base_mode);
native_display_info.SetDisplayModes(mode_list);
std::vector<DisplayInfo> display_info_list;
@@ -1327,8 +1356,10 @@ TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScalingNoOverride) {
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1920, 1080));
native_display_info.set_device_scale_factor(1.25);
- const DisplayMode base_mode(gfx::Size(1920, 1080), 60.0f, false, false);
- std::vector<DisplayMode> mode_list = CreateInternalDisplayModeList(base_mode);
+ const scoped_refptr<DisplayMode>& base_mode(
+ new DisplayMode(gfx::Size(1920, 1080), 60.0f, false, false));
+ DisplayInfo::DisplayModeList mode_list =
+ CreateInternalDisplayModeList(base_mode);
native_display_info.SetDisplayModes(mode_list);
std::vector<DisplayInfo> display_info_list;
@@ -1354,17 +1385,17 @@ TEST_P(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
int64_t unified_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
DisplayInfo info = display_manager()->GetDisplayInfo(unified_id);
ASSERT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("400x200", info.display_modes()[0].size.ToString());
- EXPECT_TRUE(info.display_modes()[0].native);
- EXPECT_EQ("800x400", info.display_modes()[1].size.ToString());
- EXPECT_FALSE(info.display_modes()[1].native);
+ EXPECT_EQ("400x200", info.display_modes()[0]->size().ToString());
+ EXPECT_TRUE(info.display_modes()[0]->native());
+ EXPECT_EQ("800x400", info.display_modes()[1]->size().ToString());
+ EXPECT_FALSE(info.display_modes()[1]->native());
EXPECT_EQ(
"400x200",
display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
- DisplayMode active_mode =
+ scoped_refptr<DisplayMode> active_mode =
display_manager()->GetActiveModeForDisplayId(unified_id);
- EXPECT_EQ(1.0f, active_mode.ui_scale);
- EXPECT_EQ("400x200", active_mode.size.ToString());
+ EXPECT_EQ(1.0f, active_mode->ui_scale());
+ EXPECT_EQ("400x200", active_mode->size().ToString());
EXPECT_TRUE(test::SetDisplayResolution(unified_id, gfx::Size(800, 400)));
EXPECT_EQ(
@@ -1372,8 +1403,8 @@ TEST_P(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
active_mode = display_manager()->GetActiveModeForDisplayId(unified_id);
- EXPECT_EQ(1.0f, active_mode.ui_scale);
- EXPECT_EQ("800x400", active_mode.size.ToString());
+ EXPECT_EQ(1.0f, active_mode->ui_scale());
+ EXPECT_EQ("800x400", active_mode->size().ToString());
// resolution change will not persist in unified desktop mode.
UpdateDisplay("600x600, 200x200");
@@ -1381,9 +1412,9 @@ TEST_P(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
"1200x600",
display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
active_mode = display_manager()->GetActiveModeForDisplayId(unified_id);
- EXPECT_EQ(1.0f, active_mode.ui_scale);
- EXPECT_TRUE(active_mode.native);
- EXPECT_EQ("1200x600", active_mode.size.ToString());
+ EXPECT_EQ(1.0f, active_mode->ui_scale());
+ EXPECT_TRUE(active_mode->native());
+ EXPECT_EQ("1200x600", active_mode->size().ToString());
}
// TODO(scottmg): RootWindow doesn't get resized on Windows
@@ -1905,10 +1936,10 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
DisplayInfo info =
display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
EXPECT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("1640x800", info.display_modes()[0].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
- EXPECT_EQ("1025x500", info.display_modes()[1].size.ToString());
- EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+ EXPECT_EQ("1640x800", info.display_modes()[0]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+ EXPECT_EQ("1025x500", info.display_modes()[1]->size().ToString());
+ EXPECT_EQ(1.0f, info.display_modes()[1]->device_scale_factor());
// For 1x, 400 + 500 / 800 * 100 = 1025.
EXPECT_EQ("1025x500", screen->GetPrimaryDisplay().size().ToString());
@@ -1924,10 +1955,10 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
UpdateDisplay("1200x800*2,1000x1000");
info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
EXPECT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("2000x800", info.display_modes()[0].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
- EXPECT_EQ("2500x1000", info.display_modes()[1].size.ToString());
- EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+ EXPECT_EQ("2000x800", info.display_modes()[0]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+ EXPECT_EQ("2500x1000", info.display_modes()[1]->size().ToString());
+ EXPECT_EQ(1.0f, info.display_modes()[1]->device_scale_factor());
// For 2x, (800 / 1000 * 1000 + 1200) / 2 = 1000
EXPECT_EQ("1000x400", screen->GetPrimaryDisplay().size().ToString());
@@ -1944,10 +1975,10 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
UpdateDisplay("1200x800*2,1000x1000*2");
info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
EXPECT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("2000x800", info.display_modes()[0].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
- EXPECT_EQ("2500x1000", info.display_modes()[1].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[1].device_scale_factor);
+ EXPECT_EQ("2000x800", info.display_modes()[0]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+ EXPECT_EQ("2500x1000", info.display_modes()[1]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[1]->device_scale_factor());
EXPECT_EQ("1000x400", screen->GetPrimaryDisplay().size().ToString());
EXPECT_EQ("1000x400",
@@ -1962,10 +1993,10 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
UpdateDisplay("1000x800*2,300x800");
info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
EXPECT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("1300x800", info.display_modes()[0].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
- EXPECT_EQ("1300x800", info.display_modes()[1].size.ToString());
- EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+ EXPECT_EQ("1300x800", info.display_modes()[0]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+ EXPECT_EQ("1300x800", info.display_modes()[1]->size().ToString());
+ EXPECT_EQ(1.0f, info.display_modes()[1]->device_scale_factor());
EXPECT_EQ("650x400", screen->GetPrimaryDisplay().size().ToString());
EXPECT_EQ("650x400",
@@ -1979,10 +2010,10 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
// being 2x.
UpdateDisplay("1000x800,300x800*2");
EXPECT_EQ(2u, info.display_modes().size());
- EXPECT_EQ("1300x800", info.display_modes()[0].size.ToString());
- EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
- EXPECT_EQ("1300x800", info.display_modes()[1].size.ToString());
- EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+ EXPECT_EQ("1300x800", info.display_modes()[0]->size().ToString());
+ EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+ EXPECT_EQ("1300x800", info.display_modes()[1]->size().ToString());
+ EXPECT_EQ(1.0f, info.display_modes()[1]->device_scale_factor());
EXPECT_EQ("1300x800", screen->GetPrimaryDisplay().size().ToString());
EXPECT_EQ("1300x800",
@@ -2092,15 +2123,14 @@ TEST_P(DisplayManagerTest, DockMode) {
EXPECT_FALSE(display_manager()->IsActiveDisplayId(internal_id));
const DisplayInfo& info = display_manager()->GetDisplayInfo(internal_id);
- DisplayMode mode;
- EXPECT_FALSE(GetDisplayModeForNextUIScale(info, true, &mode));
- EXPECT_FALSE(GetDisplayModeForNextUIScale(info, false, &mode));
+ EXPECT_FALSE(!!GetDisplayModeForNextUIScale(info, true));
+ EXPECT_FALSE(!!GetDisplayModeForNextUIScale(info, false));
EXPECT_FALSE(SetDisplayUIScale(internal_id, 1.0f));
DisplayInfo invalid_info;
- EXPECT_FALSE(GetDisplayModeForNextUIScale(invalid_info, true, &mode));
- EXPECT_FALSE(GetDisplayModeForNextUIScale(invalid_info, false, &mode));
+ EXPECT_FALSE(!!GetDisplayModeForNextUIScale(invalid_info, true));
+ EXPECT_FALSE(!!GetDisplayModeForNextUIScale(invalid_info, false));
EXPECT_FALSE(SetDisplayUIScale(display::Display::kInvalidDisplayID, 1.0f));
}
« ash/accelerators/accelerator_commands_aura.cc ('K') | « ash/display/display_manager.cc ('k') | ash/display/display_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698