| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index 6ea7e2ec22010e863e109012fbb8aa56e641af59..9f1036d517d476ab34121c66b722523c1e13c838 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -26,6 +26,7 @@
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gpu_switching_manager.h"
|
| +#include "url/gurl.h"
|
|
|
| #if defined(USE_OZONE)
|
| #include "ui/ozone/public/gpu_platform_support.h"
|
| @@ -281,7 +282,7 @@ void GpuChildThread::OnInitialize() {
|
| // IPC messages before the sandbox has been enabled and all other necessary
|
| // initialization has succeeded.
|
| gpu_channel_manager_.reset(
|
| - new GpuChannelManager(channel(), watchdog_thread_.get(),
|
| + new GpuChannelManager(this, channel(), watchdog_thread_.get(),
|
| base::ThreadTaskRunnerHandle::Get().get(),
|
| ChildProcess::current()->io_task_runner(),
|
| ChildProcess::current()->GetShutDownEvent(),
|
| @@ -305,6 +306,10 @@ void GpuChildThread::StopWatchdog() {
|
| }
|
| }
|
|
|
| +void GpuChildThread::SetActiveURL(const std::string& url) {
|
| + GetContentClient()->SetActiveURL(GURL(url));
|
| +}
|
| +
|
| void GpuChildThread::OnCollectGraphicsInfo() {
|
| #if defined(OS_WIN)
|
| // GPU full info collection should only happen on un-sandboxed GPU process
|
|
|