Fix ws::Display initialization order.

services/ui/ws/display_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/display_manager.h"
 
+#include <vector>
+
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
@@ skipping 152 matching lines @@
     current_window_manager_state->Activate(mouse_location_on_screen);
 }
 
 void DisplayManager::OnDisplayAdded(int64_t id,
                                     const display::ViewportMetrics& metrics) {
   TRACE_EVENT1("mus-ws", "OnDisplayAdded", "id", id);
   PlatformDisplayInitParams params;
   params.display_id = id;
   params.metrics = metrics;
 
-  ws::Display* display = new ws::Display(window_server_, params);
-  display->Init(nullptr);
+  ws::Display* display = new ws::Display(window_server_);
+  display->Init(params, nullptr);
 
   window_server_->delegate()->UpdateTouchTransforms();
 }
 
 void DisplayManager::OnDisplayRemoved(int64_t id) {
   TRACE_EVENT1("mus-ws", "OnDisplayRemoved", "id", id);
   Display* display = GetDisplayById(id);
   if (display)
     DestroyDisplay(display);
 }
@@ skipping 26 matching lines @@
 void DisplayManager::OnPrimaryDisplayChanged(int64_t primary_display_id) {
   // TODO(kylechar): Send IPCs to WM clients first.
 
   // Send IPCs to any DisplayManagerObservers.
   for (const auto& pair : user_display_managers_)
     pair.second->OnPrimaryDisplayChanged(primary_display_id);
 }
 
 }  // namespace ws
 }  // namespace ui