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

Unified Diff: ash/display/window_tree_host_manager.cc

Issue 2821203002: cros: Adds ShellPort functions for simplified display mode (Closed)
Patch Set: Fix x11 build Created 3 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/mirror_window_controller.cc ('k') | ash/host/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/window_tree_host_manager.cc
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index fde5d13ed263fac56b0ab7bd45ad59229a9b06c9..7f11547024ddfca02b103ad16dc651528976d39b 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -813,7 +813,10 @@ AshWindowTreeHost* WindowTreeHostManager::AddWindowTreeHostForDisplay(
params_with_bounds.initial_bounds = display_info.bounds_in_native();
params_with_bounds.offscreen =
display.id() == display::DisplayManager::kUnifiedDisplayId;
- AshWindowTreeHost* ash_host = AshWindowTreeHost::Create(params_with_bounds);
+ // The AshWindowTreeHost ends up owned by the RootWindowControllers created
+ // by this class.
+ AshWindowTreeHost* ash_host =
+ AshWindowTreeHost::Create(params_with_bounds).release();
aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
if (!input_method_) { // Singleton input method instance for Ash.
input_method_ = ui::CreateInputMethod(this, host->GetAcceleratedWidget());
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/host/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698