summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/interface_list.cc12
-rw-r--r--ppapi/proxy/interface_list.h6
2 files changed, 9 insertions, 9 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) {
diff --git a/ppapi/proxy/interface_list.h b/ppapi/proxy/interface_list.h
index 7354af5..bcbd3b8 100644
--- a/ppapi/proxy/interface_list.h
+++ b/ppapi/proxy/interface_list.h
@@ -47,15 +47,15 @@ class InterfaceList {
}
InterfaceID id;
- const void* interface;
+ const void* iface;
};
typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;
void AddProxy(InterfaceID id, InterfaceProxy::Factory factory);
- void AddPPB(const char* name, InterfaceID id, const void* interface);
- void AddPPP(const char* name, InterfaceID id, const void* interface);
+ void AddPPB(const char* name, InterfaceID id, const void* iface);
+ void AddPPP(const char* name, InterfaceID id, const void* iface);
// Old-style add functions. These should be removed when the rest of the
// proxies are converted over to using the new system.