diff options
| author | oshima <oshima@chromium.org> | 2016-02-11 17:00:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 01:02:22 +0000 |
| commit | 61af6e1cdaa35e293518abc1b24a679c434db75e (patch) | |
| tree | 9a56a2030706ce64ad13e38105591f9a14ef023f /ash/sticky_keys | |
| parent | 1b15c58e53f7a0c98e0240c13dbd6719cfbb56b4 (diff) | |
| download | chromium_src-61af6e1cdaa35e293518abc1b24a679c434db75e.zip chromium_src-61af6e1cdaa35e293518abc1b24a679c434db75e.tar.gz chromium_src-61af6e1cdaa35e293518abc1b24a679c434db75e.tar.bz2 | |
Add explicit display ids in DisplayPlacement
* Client is now responsible to provide parent display id, instead of implicitly using primary display as a parent.
BUG=582491
TBR=benwells@chromium.org
TEST=no functional change. all tests should pass.
plus, DisplayManagerTest.GuessDisplayIdFieldsInDisplayLayout
Review URL: https://codereview.chromium.org/1680353003
Cr-Commit-Position: refs/heads/master@{#375066}
Diffstat (limited to 'ash/sticky_keys')
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc index 3f7e588..8fb0d1f 100644 --- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc +++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc @@ -9,6 +9,7 @@ #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_base.h" +#include "ash/test/display_manager_test_api.h" #include "ui/events/event.h" #include "ui/views/widget/widget.h" @@ -50,7 +51,7 @@ TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) { int64_t primary_display_id = display_ids[0]; int64_t secondary_display_id = display_ids[1]; display_manager->SetLayoutForCurrentDisplays( - DisplayLayout(DisplayPlacement::LEFT, 0)); + test::CreateDisplayLayout(DisplayPlacement::LEFT, 0)); // The overlay should belong to the secondary root window. StickyKeysOverlay overlay; |