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

Unified Diff: services/ui/gpu/gpu_main.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 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 | « services/ui/gpu/gpu_main.h ('k') | services/ui/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/gpu/gpu_main.cc
diff --git a/services/ui/gpu/gpu_main.cc b/services/ui/gpu/gpu_main.cc
index 6b70fcf411a75ff0339fb39367ed66c56796f106..c0c1306487e281a9cfa27148766c018c08d3a50d 100644
--- a/services/ui/gpu/gpu_main.cc
+++ b/services/ui/gpu/gpu_main.cc
@@ -50,8 +50,15 @@ namespace ui {
GpuMain::GpuMain(mojom::GpuMainRequest request)
: gpu_thread_("GpuThread"),
io_thread_("GpuIOThread"),
- power_monitor_(base::MakeUnique<base::PowerMonitorDeviceSource>()),
binding_(this) {
+ // TODO: crbug.com/609317: Remove this when Mus Window Server and GPU are
+ // split into separate processes. Until then this is necessary to be able to
+ // run Mushrome (chrome --mus) with Mus running in the browser process.
+ if (!base::PowerMonitor::Get()) {
+ power_monitor_ = base::MakeUnique<base::PowerMonitor>(
+ base::MakeUnique<base::PowerMonitorDeviceSource>());
+ }
+
base::Thread::Options thread_options;
#if defined(OS_WIN)
« no previous file with comments | « services/ui/gpu/gpu_main.h ('k') | services/ui/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698