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

Unified Diff: ash/display/mirror_window_controller.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: Update to 1c9b022 and Fix Newly Added Code Impacted by Breaking Change 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
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 7633e13defa4902fdcdca4db8281e3cb3a6175b4..a73071f38631a76987c0a66dfa2aa9ccfaffd113 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -34,6 +34,7 @@
#include "ui/aura/window_tree_host.h"
#include "ui/base/layout.h"
#include "ui/compositor/reflector.h"
+#include "ui/display/manager/display_layout.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/screen.h"
@@ -332,9 +333,10 @@ gfx::Display MirrorWindowController::GetDisplayForRootWindow(
if (pair.second->ash_host->AsWindowTreeHost()->window() == root) {
// Sanity check to catch an error early.
int64_t id = pair.first;
- const DisplayList& list = Shell::GetInstance()
- ->display_manager()
- ->software_mirroring_display_list();
+ const display::DisplayList& list =
+ Shell::GetInstance()
+ ->display_manager()
+ ->software_mirroring_display_list();
auto iter = std::find_if(
list.begin(), list.end(),
[id](const gfx::Display& display) { return display.id() == id; });

Powered by Google App Engine
This is Rietveld 408576698