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

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

Issue 2497303002: Fix ws::Display initialization order. (Closed)
Patch Set: Fix use after move in test. 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
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/frame_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/display_manager.cc
diff --git a/services/ui/ws/display_manager.cc b/services/ui/ws/display_manager.cc
index 7e414e5d6d1dd327c90866f0528e3ebe0f2ec523..3607d602526b1bfbb033ec1cf1582899c53ee2d0 100644
--- a/services/ui/ws/display_manager.cc
+++ b/services/ui/ws/display_manager.cc
@@ -4,6 +4,8 @@
#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"
@@ -176,8 +178,8 @@ void DisplayManager::OnDisplayAdded(int64_t id,
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();
}
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/frame_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698