| Index: content/common/child_process_messages.h
|
| diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
|
| index 611296d5be248aac529c6f688fa027b8ef877e53..fda49ad25a1e86549b09febb085a71d9172bcacb 100644
|
| --- a/content/common/child_process_messages.h
|
| +++ b/content/common/child_process_messages.h
|
| @@ -17,19 +17,16 @@
|
| #include "cc/resources/shared_bitmap_manager.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/content_param_traits_macros.h"
|
| -#include "content/common/gpu/gpu_process_launch_causes.h"
|
| #include "content/common/host_discardable_shared_memory_manager.h"
|
| #include "gpu/command_buffer/common/sync_token.h"
|
| #include "gpu/ipc/common/gpu_param_traits_macros.h"
|
| +#include "gpu/ipc/common/gpu_process_launch_causes.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_platform_file.h"
|
| #include "ui/gfx/gpu_memory_buffer.h"
|
| #include "ui/gfx/ipc/gfx_param_traits.h"
|
|
|
| -IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch,
|
| - content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1)
|
| -
|
| IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status,
|
| tracked_objects::ThreadData::STATUS_LAST)
|
|
|
| @@ -126,7 +123,7 @@ IPC_MESSAGE_CONTROL1(ChildProcessMsg_InitializeClientNativePixmapFactory,
|
| // process. The browser will create the GPU process if necessary, and will
|
| // return a handle to the channel via a GpuChannelEstablished message.
|
| IPC_SYNC_MESSAGE_CONTROL1_3(ChildProcessHostMsg_EstablishGpuChannel,
|
| - content::CauseForGpuLaunch,
|
| + gpu::CauseForGpuLaunch,
|
| int /* client id */,
|
| IPC::ChannelHandle /* handle to channel */,
|
| gpu::GPUInfo /* stats about GPU process*/)
|
|
|