Index: gpu/ipc/service/gpu_init.cc |
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc |
index 2af73234148c4563f40ca4559d185e4fa96d9352..64735e75d53e7b8817ff540f97082447369d9011 100644 |
--- a/gpu/ipc/service/gpu_init.cc |
+++ b/gpu/ipc/service/gpu_init.cc |
@@ -21,6 +21,10 @@ |
#include "ui/gl/gl_switches.h" |
#include "ui/gl/init/gl_factory.h" |
+#if defined(USE_OZONE) |
+#include "ui/ozone/public/ozone_platform.h" |
+#endif |
+ |
namespace gpu { |
namespace { |
@@ -114,7 +118,8 @@ GpuInit::GpuInit() {} |
GpuInit::~GpuInit() {} |
-bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) { |
+bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line, |
+ shell::Connector* connector) { |
if (command_line.HasSwitch(switches::kSupportsDualGpus)) { |
std::set<int> workarounds; |
gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine(&workarounds, |
@@ -169,6 +174,12 @@ bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) { |
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); |
+#if defined(USE_OZONE) |
+ ui::OzonePlatform::InitParams ozoneInitParams; |
+ ozoneInitParams.connector = connector; |
+ ui::OzonePlatform::InitializeForGPU(ozoneInitParams); |
+#endif |
+ |
// Load and initialize the GL implementation and locate the GL entry points if |
// needed. This initialization may have already happened if running in the |
// browser process, for example. |