Index: services/ui/ws/window_server.cc |
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc |
index 0bf97ea295c503d7a332a5bc7456b6538e530a13..1004123ba77d6a8fc7cd984e7a3a0ac870b17bbb 100644 |
--- a/services/ui/ws/window_server.cc |
+++ b/services/ui/ws/window_server.cc |
@@ -764,7 +764,14 @@ void WindowServer::OnTransientWindowRemoved(ServerWindow* window, |
void WindowServer::OnGpuServiceInitialized() { |
// TODO(kylechar): When gpu channel is removed, this can instead happen |
// earlier, after GpuHost::OnInitialized(). |
- delegate_->StartDisplayInit(); |
+ bool window_manager_connected = false; |
rjkroege
2017/01/23 21:19:43
Are you sure that this does the right thing in INT
fwang
2017/01/24 17:11:51
Good point. As I see this commit does not change t
|
+ for (auto* factory : window_manager_window_tree_factory_set_.GetFactories()) { |
+ if (factory->window_tree()) { |
+ window_manager_connected = true; |
+ break; |
+ } |
+ } |
+ delegate_->StartDisplayInit(window_manager_connected); |
} |
void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) { |