Index: content/browser/gpu/gpu_process_host_ui_shim.cc |
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc |
index f50db216e35c78f15911fd99e2d8e8ebfe668056..5cd28f96fb9b69826d9507561430dab88eabc00f 100644 |
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc |
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc |
@@ -22,7 +22,7 @@ |
#include "content/browser/renderer_host/render_view_host_impl.h" |
#include "content/browser/renderer_host/render_widget_helper.h" |
#include "content/browser/renderer_host/render_widget_host_view_base.h" |
-#include "content/common/gpu/gpu_messages.h" |
+#include "content/common/gpu/gpu_browser_messages.h" |
#include "content/public/browser/browser_thread.h" |
#if defined(OS_MACOSX) |
@@ -161,15 +161,15 @@ void GpuProcessHostUIShim::StopGpuProcess(const base::Closure& callback) { |
} |
void GpuProcessHostUIShim::SimulateRemoveAllContext() { |
- Send(new GpuMsg_Clean()); |
+ Send(new GpuBrowserMsg_Clean()); |
} |
void GpuProcessHostUIShim::SimulateCrash() { |
- Send(new GpuMsg_Crash()); |
+ Send(new GpuBrowserMsg_Crash()); |
} |
void GpuProcessHostUIShim::SimulateHang() { |
- Send(new GpuMsg_Hang()); |
+ Send(new GpuBrowserMsg_Hang()); |
} |
GpuProcessHostUIShim::~GpuProcessHostUIShim() { |
@@ -184,18 +184,18 @@ bool GpuProcessHostUIShim::OnControlMessageReceived( |
DCHECK(CalledOnValidThread()); |
IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message) |
- IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage, |
- OnLogMessage) |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_OnLogMessage, OnLogMessage) |
#if defined(OS_MACOSX) |
- IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped, |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_AcceleratedSurfaceBuffersSwapped, |
OnAcceleratedSurfaceBuffersSwapped) |
#endif |
- IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected, |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_GraphicsInfoCollected, |
OnGraphicsInfoCollected) |
- IPC_MESSAGE_HANDLER(GpuHostMsg_VideoMemoryUsageStats, |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_VideoMemoryUsageStats, |
OnVideoMemoryUsageStatsReceived); |
- IPC_MESSAGE_HANDLER(GpuHostMsg_AddSubscription, OnAddSubscription); |
- IPC_MESSAGE_HANDLER(GpuHostMsg_RemoveSubscription, OnRemoveSubscription); |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_AddSubscription, OnAddSubscription); |
+ IPC_MESSAGE_HANDLER(GpuBrowserHostMsg_RemoveSubscription, |
+ OnRemoveSubscription); |
IPC_MESSAGE_UNHANDLED_ERROR() |
IPC_END_MESSAGE_MAP() |
@@ -222,12 +222,12 @@ void GpuProcessHostUIShim::OnGraphicsInfoCollected( |
#if defined(OS_MACOSX) |
void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped( |
- const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) { |
+ const GpuBrowserHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) { |
TRACE_EVENT0("browser", |
"GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped"); |
- if (!ui::LatencyInfo::Verify(params.latency_info, |
- "GpuHostMsg_AcceleratedSurfaceBuffersSwapped")) { |
- |
+ if (!ui::LatencyInfo::Verify( |
+ params.latency_info, |
+ "GpuBrowserHostMsg_AcceleratedSurfaceBuffersSwapped")) { |
TRACE_EVENT0("browser", "ui::LatencyInfo::Verify failed"); |
return; |
} |