Index: content/gpu/gpu_child_thread.h |
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h |
index 70aace9fac776dfc74e0de1823d351f58d867312..a9208170ea5d7e5030d810fb5c67b8e940f62bd5 100644 |
--- a/content/gpu/gpu_child_thread.h |
+++ b/content/gpu/gpu_child_thread.h |
@@ -25,6 +25,7 @@ |
#include "gpu/ipc/service/gpu_channel_manager.h" |
#include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
#include "gpu/ipc/service/gpu_config.h" |
+#include "gpu/ipc/service/gpu_init_delegate.h" |
#include "gpu/ipc/service/x_util.h" |
#include "mojo/public/cpp/bindings/binding_set.h" |
#include "services/shell/public/interfaces/service_factory.mojom.h" |
@@ -56,12 +57,10 @@ class GpuChildThread : public ChildThreadImpl, |
public gpu::GpuChannelManagerDelegate, |
public base::FieldTrialList::Observer { |
public: |
- typedef std::queue<IPC::Message*> DeferredMessages; |
- |
GpuChildThread(gpu::GpuWatchdogThread* gpu_watchdog_thread, |
bool dead_on_arrival, |
const gpu::GPUInfo& gpu_info, |
- const DeferredMessages& deferred_messages, |
+ std::vector<gpu::GpuInitLogMessage> deferred_messages, |
gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); |
GpuChildThread(const gpu::GpuPreferences& gpu_preferences, |
@@ -156,7 +155,7 @@ class GpuChildThread : public ChildThreadImpl, |
gpu::GPUInfo gpu_info_; |
// Error messages collected in gpu_main() before the thread is created. |
- DeferredMessages deferred_messages_; |
+ std::vector<gpu::GpuInitLogMessage> deferred_messages_; |
// Whether the GPU thread is running in the browser process. |
bool in_browser_process_; |