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

Unified Diff: ash/display/mirror_window_controller_unittest.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build 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
Index: ash/display/mirror_window_controller_unittest.cc
diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc
index 1e5996bb38b681963acdd972f62fa464c920026a..d034ec84a89c7b0e1c232e22acfb9cbfd6519cd9 100644
--- a/ash/display/mirror_window_controller_unittest.cc
+++ b/ash/display/mirror_window_controller_unittest.cc
@@ -26,8 +26,9 @@
namespace ash {
namespace {
-DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
- DisplayInfo info(id, base::StringPrintf("x-%d", static_cast<int>(id)), false);
+ui::ManagedDisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
+ ui::ManagedDisplayInfo info(
+ id, base::StringPrintf("x-%d", static_cast<int>(id)), false);
info.SetBounds(bounds);
return info;
}
@@ -257,11 +258,11 @@ TEST_F(MirrorWindowControllerTest, MAYBE_DockMode) {
const int64_t internal_id = 1;
const int64_t external_id = 2;
- const DisplayInfo internal_display_info =
+ const ui::ManagedDisplayInfo internal_display_info =
CreateDisplayInfo(internal_id, gfx::Rect(0, 0, 500, 500));
- const DisplayInfo external_display_info =
+ const ui::ManagedDisplayInfo external_display_info =
CreateDisplayInfo(external_id, gfx::Rect(1, 1, 100, 100));
- std::vector<DisplayInfo> display_info_list;
+ std::vector<ui::ManagedDisplayInfo> display_info_list;
display_manager->SetMultiDisplayMode(DisplayManager::MIRRORING);

Powered by Google App Engine
This is Rietveld 408576698