Index: content/browser/gpu/gpu_process_host.cc |
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc |
index e4ba59f57191b91f3b8030a05a08d7400a726537..670cca8d3eb064fa20d6e47fda8714a447c6233a 100644 |
--- a/content/browser/gpu/gpu_process_host.cc |
+++ b/content/browser/gpu/gpu_process_host.cc |
@@ -158,9 +158,8 @@ enum GPUProcessLifetimeEvent { |
// only be accessed from the IO thread. |
GpuProcessHost* g_gpu_process_hosts[GpuProcessHost::GPU_PROCESS_KIND_COUNT]; |
- |
void SendGpuProcessMessage(GpuProcessHost::GpuProcessKind kind, |
- CauseForGpuLaunch cause, |
+ gpu::CauseForGpuLaunch cause, |
IPC::Message* message) { |
GpuProcessHost* host = GpuProcessHost::Get(kind, cause); |
if (host) { |
@@ -310,7 +309,7 @@ bool GpuProcessHost::ValidateHost(GpuProcessHost* host) { |
// static |
GpuProcessHost* GpuProcessHost::Get(GpuProcessKind kind, |
- CauseForGpuLaunch cause) { |
+ gpu::CauseForGpuLaunch cause) { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
// Don't grant further access to GPU if it is not allowed. |
@@ -322,16 +321,15 @@ GpuProcessHost* GpuProcessHost::Get(GpuProcessKind kind, |
if (g_gpu_process_hosts[kind] && ValidateHost(g_gpu_process_hosts[kind])) |
return g_gpu_process_hosts[kind]; |
- if (cause == CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH) |
+ if (cause == gpu::CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH) |
return NULL; |
static int last_host_id = 0; |
int host_id; |
host_id = ++last_host_id; |
- UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLaunchCause", |
- cause, |
- CAUSE_FOR_GPU_LAUNCH_MAX_ENUM); |
+ UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLaunchCause", cause, |
+ gpu::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM); |
GpuProcessHost* host = new GpuProcessHost(host_id, kind); |
if (host->Init()) |
@@ -370,7 +368,7 @@ void GpuProcessHost::GetProcessHandles( |
// static |
void GpuProcessHost::SendOnIO(GpuProcessKind kind, |
- CauseForGpuLaunch cause, |
+ gpu::CauseForGpuLaunch cause, |
IPC::Message* message) { |
if (!BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |