summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/interface_list.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 20:27:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 20:27:28 +0000
commit7a291939be5079829b0f87d8007f0885cda2533e (patch)
tree0781771d53aa6b0d01cc54aeba58db3e596677f4 /ppapi/proxy/interface_list.cc
parent3114db2cefe843ddd19ab6961fbd944b9f9e32ae (diff)
downloadchromium_src-7a291939be5079829b0f87d8007f0885cda2533e.zip
chromium_src-7a291939be5079829b0f87d8007f0885cda2533e.tar.gz
chromium_src-7a291939be5079829b0f87d8007f0885cda2533e.tar.bz2
Fix Windows build by renaming interface to iface.
TEST=it compiles Review URL: http://codereview.chromium.org/7871005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
-rw-r--r--ppapi/proxy/interface_list.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index b03ba9b..0b386aa 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -241,7 +241,7 @@ const void* InterfaceList::GetInterfaceForPPB(const std::string& name) const {
name_to_browser_info_.find(name);
if (found == name_to_browser_info_.end())
return NULL;
- return found->second.interface;
+ return found->second.iface;
}
const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
@@ -249,7 +249,7 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
name_to_plugin_info_.find(name);
if (found == name_to_plugin_info_.end())
return NULL;
- return found->second.interface;
+ return found->second.iface;
}
void InterfaceList::AddProxy(InterfaceID id,
@@ -270,16 +270,16 @@ void InterfaceList::AddProxy(InterfaceID id,
void InterfaceList::AddPPB(const char* name,
InterfaceID id,
- const void* interface) {
+ const void* iface) {
DCHECK(name_to_browser_info_.find(name) == name_to_browser_info_.end());
- name_to_browser_info_[name] = InterfaceInfo(id, interface);
+ name_to_browser_info_[name] = InterfaceInfo(id, iface);
}
void InterfaceList::AddPPP(const char* name,
InterfaceID id,
- const void* interface) {
+ const void* iface) {
DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end());
- name_to_plugin_info_[name] = InterfaceInfo(id, interface);
+ name_to_plugin_info_[name] = InterfaceInfo(id, iface);
}
void InterfaceList::AddPPB(const InterfaceProxy::Info* info) {