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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/ui/ws/window_server.cc

Issue 2503923003: Demonstrate external-window-mode in mus-demo (Closed)
Patch Set: Determine external window mode in mus-ws based on if a WM is connected Created 4 years, 1 month 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
« services/ui/ws/test_utils.h ('K') | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_server_delegate.h » ('j') | services/ui/ws/window_tree_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index b589f61554d4d335f741ecd7f77f81022a9082f6..28b55665ba56c9926b7ec704704316a785384cec 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -753,7 +753,14 @@ void WindowServer::OnGpuChannelEstablished(
display->platform_display()->OnGpuChannelEstablished(gpu_channel_);
// TODO(kylechar): When gpu channel is removed, this can instead happen
// earlier, after GpuServiceProxy::OnInitialized().
- delegate_->StartDisplayInit();
+ bool window_manager_connected = false;
+ 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::SurfaceId& surface_id,
« services/ui/ws/test_utils.h ('K') | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_server_delegate.h » ('j') | services/ui/ws/window_tree_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698