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

Unified Diff: ash/sticky_keys/sticky_keys_overlay_unittest.cc

Issue 1838833002: Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screenwinmove
Patch Set: Fix comment Created 4 years, 8 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
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/test/display_manager_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8fb0d1f75fa8a7f6bc57a6b09dbfa2f9817f0a19..ac67d4fca62c98ed2c9bdf24e277ec4d90a43f06 100644
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -10,6 +10,7 @@
#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/display/manager/display_layout.h"
#include "ui/events/event.h"
#include "ui/views/widget/widget.h"
@@ -47,11 +48,12 @@ 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();
- DisplayIdList display_ids = display_manager->GetCurrentDisplayIdList();
+ display::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(
- test::CreateDisplayLayout(DisplayPlacement::LEFT, 0));
+ test::CreateDisplayLayout(display::DisplayPlacement::LEFT, 0));
// The overlay should belong to the secondary root window.
StickyKeysOverlay overlay;
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/test/display_manager_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698