summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:16:19 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:16:19 +0000
commiteb398193640924b8e55c6b2d00077838146ea8eb (patch)
treefc832fdabf40bad4ea19253b19216f1111fdc166 /ppapi
parentf6b218e0969ab52a1a623260a8242030f8aeef31 (diff)
downloadchromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.zip
chromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.tar.gz
chromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.tar.bz2
Move a bunch of code in content\common (as well as a few left in renderer) to the content namespace.
Review URL: https://codereview.chromium.org/11227033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.cc4
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index bbca552..2dea1bf 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -76,8 +76,8 @@ bool PpapiCommandBufferProxy::SignalSyncPoint(uint32 sync_point,
}
void PpapiCommandBufferProxy::SetMemoryAllocationChangedCallback(
- const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
- callback) {
+ const base::Callback<void(
+ const content::GpuMemoryAllocationForRenderer&)>& callback) {
NOTIMPLEMENTED();
}
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
index 7cf35ac..d78ee87 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -40,8 +40,8 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public CommandBufferProxy {
virtual bool SignalSyncPoint(uint32 sync_point,
const base::Closure& callback) OVERRIDE;
virtual void SetMemoryAllocationChangedCallback(
- const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
- callback) OVERRIDE;
+ const base::Callback<void(
+ const content::GpuMemoryAllocationForRenderer&)>& callback) OVERRIDE;
virtual bool SetParent(CommandBufferProxy* parent_command_buffer,
uint32 parent_texture_id) OVERRIDE;
virtual void SetChannelErrorCallback(const base::Closure& callback) OVERRIDE;