| 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..994633316f9b6bb7f637002401ac6c5eb0da3816 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"
|
| @@ -24,6 +23,7 @@
|
| #include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/aura/window_tracker.h"
|
| #include "ui/display/display.h"
|
| +#include "ui/display/manager/display_info.h"
|
| #include "ui/display/manager/display_layout.h"
|
| #include "ui/display/screen.h"
|
| #include "ui/events/event_handler.h"
|
| @@ -123,9 +123,9 @@ std::unique_ptr<RootWindowTransformer>
|
| CreateCurrentRootWindowTransformerForMirroring() {
|
| DisplayManager* display_manager = Shell::GetInstance()->display_manager();
|
| DCHECK(display_manager->IsInMirrorMode());
|
| - const DisplayInfo& mirror_display_info =
|
| + const ui::DisplayInfo& mirror_display_info =
|
| display_manager->GetDisplayInfo(display_manager->mirroring_display_id());
|
| - const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
|
| + const ui::DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
|
| display::Screen::GetScreen()->GetPrimaryDisplay().id());
|
| return std::unique_ptr<RootWindowTransformer>(
|
| CreateRootWindowTransformerForMirroredDisplay(source_display_info,
|
|
|