diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 00:01:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 00:01:30 +0000 |
| commit | 56d7ad42237c35d2b7653c7cad89e9ca6ea75d68 (patch) | |
| tree | b16971de9045c0f3524566b5a242bef0ac0ab1db /ppapi/proxy/ppb_instance_proxy.cc | |
| parent | f26d7fa665143e0bf1c173e093f9eadce0a10e97 (diff) | |
| download | chromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.zip chromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.tar.gz chromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.tar.bz2 | |
Revert 113290 - Rename the shared_impl resource files to give them more regular names.
I keep getting confused between things like AudioImpl and PPB_Audio_Impl. This uses _shared for the names, so now we have _impl, _proxy, and _shared which makes more sense.
I also removed the ppb_opengles2_impl file since it was just a forward to the shared version.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8790004
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8824015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index af417e8..28bb17e 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -15,7 +15,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_var.h" #include "ppapi/shared_impl/ppapi_globals.h" -#include "ppapi/shared_impl/ppb_url_util_shared.h" +#include "ppapi/shared_impl/url_util_impl.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/thunk.h" @@ -317,9 +317,8 @@ PP_Var PPB_Instance_Proxy::ResolveRelativeToDocument( API_ID_PPB_INSTANCE, instance, SerializedVarSendInput(dispatcher(), relative), &result)); - return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL( - result.Return(dispatcher()), - components); + return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()), + components); } PP_Bool PPB_Instance_Proxy::DocumentCanRequest(PP_Instance instance, @@ -345,9 +344,8 @@ PP_Var PPB_Instance_Proxy::GetDocumentURL(PP_Instance instance, ReceiveSerializedVarReturnValue result; dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetDocumentURL( API_ID_PPB_INSTANCE, instance, &result)); - return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL( - result.Return(dispatcher()), - components); + return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()), + components); } PP_Var PPB_Instance_Proxy::GetPluginInstanceURL( @@ -356,9 +354,8 @@ PP_Var PPB_Instance_Proxy::GetPluginInstanceURL( ReceiveSerializedVarReturnValue result; dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetPluginInstanceURL( API_ID_PPB_INSTANCE, instance, &result)); - return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL( - result.Return(dispatcher()), - components); + return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()), + components); } void PPB_Instance_Proxy::PostMessage(PP_Instance instance, |