summaryrefslogtreecommitdiffstats
path: root/ash/sticky_keys
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2016-02-01 12:19:18 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-01 20:21:24 +0000
commit4763f82427f659255546657d7e94b166f2d9a405 (patch)
treeac4e8968033cafebf40d03c4e2428fa9e6c5b459 /ash/sticky_keys
parentcd2060c4979442eec8b0239d5629f0578ecf4543 (diff)
downloadchromium_src-4763f82427f659255546657d7e94b166f2d9a405.zip
chromium_src-4763f82427f659255546657d7e94b166f2d9a405.tar.gz
chromium_src-4763f82427f659255546657d7e94b166f2d9a405.tar.bz2
Use list instead of pair to represent the set of displays.
BUG=582491 Review URL: https://codereview.chromium.org/1638413007 Cr-Commit-Position: refs/heads/master@{#372736}
Diffstat (limited to 'ash/sticky_keys')
-rw-r--r--ash/sticky_keys/sticky_keys_overlay_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
index d28c536..819bc05 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));