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

Unified Diff: ash/display/cursor_window_controller.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
« no previous file with comments | « ash/display/DEPS ('k') | ash/display/display_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/cursor_window_controller.cc
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
index d79f5c55eaf4ca329c5e51b4d78265e4c9841c1e..ad3e9d18a5337d07e5d2efe039002c0454ffcd45 100644
--- a/ash/display/cursor_window_controller.cc
+++ b/ash/display/cursor_window_controller.cc
@@ -117,9 +117,10 @@ void CursorWindowController::UpdateContainer() {
if (is_cursor_compositing_enabled_) {
SetDisplay(display_);
} else {
- aura::WindowTreeHost* mirror_host = Shell::GetInstance()->
- display_controller()->mirror_window_controller()->host();
- SetContainer(mirror_host ? mirror_host->window() : NULL);
+ SetContainer(Shell::GetInstance()->
+ display_controller()->
+ mirror_window_controller()->
+ GetWindow());
}
}
« no previous file with comments | « ash/display/DEPS ('k') | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698