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

Unified Diff: ash/display/mirror_window_controller.cc

Issue 2639323003: Revert of Remove some ifdefs from ash since it only supports ChromeOS now. (Closed)
Patch Set: Created 3 years, 11 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/display/display_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 035ab953873c586ab1922eec332106cdfeb0bdca..b0e2d24f58708b56af2c74c3faee2a115031379d 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -200,6 +200,7 @@
}
#endif
+#if defined(OS_CHROMEOS)
if (display_manager->IsInUnifiedMode()) {
host_info->ash_host->ConfineCursorToRootWindow();
AshWindowTreeHost* unified_ash_host =
@@ -211,6 +212,7 @@
aura::client::SetScreenPositionClient(host->window(),
screen_position_client_.get());
}
+#endif
aura::client::SetCaptureClient(host->window(), new NoneCaptureClient());
host->Show();
« no previous file with comments | « ash/display/display_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698