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

Unified Diff: ash/display/root_window_transformers_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/root_window_transformers_unittest.cc
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 06fe95c98910ea412ce2eeb5f370bfbfc984b79b..dac22b424f82d8aa020e8e18dce606de453dde36 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "ash/common/display/display_info.h"
#include "ash/common/shelf/shelf.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/display/display_manager.h"
@@ -25,6 +24,7 @@
#include "ui/aura/window_tracker.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
#include "ui/events/event_handler.h"
#include "ui/events/test/event_generator.h"
@@ -123,10 +123,11 @@ std::unique_ptr<RootWindowTransformer>
CreateCurrentRootWindowTransformerForMirroring() {
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
DCHECK(display_manager->IsInMirrorMode());
- const DisplayInfo& mirror_display_info =
+ const ui::ManagedDisplayInfo& mirror_display_info =
display_manager->GetDisplayInfo(display_manager->mirroring_display_id());
- const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
- display::Screen::GetScreen()->GetPrimaryDisplay().id());
+ const ui::ManagedDisplayInfo& source_display_info =
+ display_manager->GetDisplayInfo(
+ display::Screen::GetScreen()->GetPrimaryDisplay().id());
return std::unique_ptr<RootWindowTransformer>(
CreateRootWindowTransformerForMirroredDisplay(source_display_info,
mirror_display_info));

Powered by Google App Engine
This is Rietveld 408576698