summaryrefslogtreecommitdiff
path: root/content/common/gpu/gpu_channel.h
diff options
context:
space:
mode:
authorBo Liu <boliu@google.com>2014-05-01 10:37:37 -0700
committerBo Liu <boliu@google.com>2014-05-01 10:37:37 -0700
commit5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 (patch)
tree5df224c921d52ab02739b38e2149652208b023e6 /content/common/gpu/gpu_channel.h
parent56e9d6e218656f3d05620cc9877fd61482337fb1 (diff)
downloadchromium_org-5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1.tar.gz
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py. Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
Diffstat (limited to 'content/common/gpu/gpu_channel.h')
-rw-r--r--content/common/gpu/gpu_channel.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index b51f845e37..390313519b 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -38,6 +38,10 @@ class ImageManager;
}
}
+namespace IPC {
+class MessageFilter;
+}
+
namespace content {
class DevToolsGpuAgent;
class GpuChannelManager;
@@ -145,8 +149,8 @@ class GpuChannel : public IPC::Listener,
void CacheShader(const std::string& key, const std::string& shader);
- void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
- void RemoveFilter(IPC::ChannelProxy::MessageFilter* filter);
+ void AddFilter(IPC::MessageFilter* filter);
+ void RemoveFilter(IPC::MessageFilter* filter);
uint64 GetMemoryUsage();