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

Unified Diff: ash/sticky_keys/sticky_keys_overlay_unittest.cc

Issue 1638413007: Use list instead of pair to represent the set of displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build error Created 4 years, 11 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
Index: ash/sticky_keys/sticky_keys_overlay_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
index d28c5364020cd7a99440979cb50d3a71201559a9..819bc05076c02ff7ccc6623836abd58657e9547b 100644
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -46,9 +46,9 @@ TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) {
// Add a secondary display to the left of the primary one.
UpdateDisplay("1280x1024,1980x1080");
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- DisplayIdPair display_ids = display_manager->GetCurrentDisplayIdPair();
- int64_t primary_display_id = display_ids.first;
- int64_t secondary_display_id = display_ids.second;
+ DisplayIdList display_ids = display_manager->GetCurrentDisplayIdList();
+ int64_t primary_display_id = display_ids[0];
+ int64_t secondary_display_id = display_ids[1];
display_manager->SetLayoutForCurrentDisplays(
DisplayLayout(DisplayLayout::LEFT, 0));

Powered by Google App Engine
This is Rietveld 408576698