summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/dispatcher.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 23:09:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 23:09:28 +0000
commitac4b54de7f49f4f0910b952888eb44fc55737195 (patch)
tree00fc8b7d9bb51ca71ee34d3befb20be85acc2a3c /ppapi/proxy/dispatcher.h
parentd365a681dce7dca73ecbd682529a98b5505e9cdb (diff)
downloadchromium_src-ac4b54de7f49f4f0910b952888eb44fc55737195.zip
chromium_src-ac4b54de7f49f4f0910b952888eb44fc55737195.tar.gz
chromium_src-ac4b54de7f49f4f0910b952888eb44fc55737195.tar.bz2
Rename InterfaceID to ApiID and move the file.
This was originally in the proxy and had a 1:1 correspondence with an interface. Then we reused this for other stuff and then merged some interfaces into larger APIs (ppapi/thunk/*_api.h) so the name was no longer accurate. It was wrong to be in the proxy directory since directories at a "lower level" than the proxy (ppapi/shared_impl and webkit/plugins/ppapi) depended on it. This renames to ApiID (I avoided APIID since it looks like a define) which is the proper description of the class, and moved it to shared_impl. This fixes the deps since there are no longer any bad dependencies on the proxy directory. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/8333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/dispatcher.h')
-rw-r--r--ppapi/proxy/dispatcher.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h
index a48cff7..9a4395e 100644
--- a/ppapi/proxy/dispatcher.h
+++ b/ppapi/proxy/dispatcher.h
@@ -16,10 +16,10 @@
#include "ppapi/c/pp_module.h"
#include "ppapi/proxy/callback_tracker.h"
#include "ppapi/proxy/proxy_channel.h"
-#include "ppapi/proxy/interface_id.h"
#include "ppapi/proxy/interface_list.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/plugin_var_tracker.h"
+#include "ppapi/shared_impl/api_id.h"
namespace ppapi {
@@ -61,7 +61,7 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel {
// Returns a non-owning pointer to the interface proxy for the given ID, or
// NULL if the ID isn't found. This will create the proxy if it hasn't been
// created so far.
- InterfaceProxy* GetInterfaceProxy(InterfaceID id);
+ InterfaceProxy* GetInterfaceProxy(ApiID id);
// Returns the pointer to the IO thread for processing IPC messages.
// TODO(brettw) remove this. It's a hack to support the Flash
@@ -110,7 +110,7 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel {
friend class PluginDispatcherTest;
// Lists all lazily-created interface proxies.
- scoped_ptr<InterfaceProxy> proxies_[INTERFACE_ID_COUNT];
+ scoped_ptr<InterfaceProxy> proxies_[API_ID_COUNT];
bool disallow_trusted_interfaces_;