summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/resource_creation_proxy.cc
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 00:50:53 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 00:50:53 +0000
commitfc31d3070e929451e0bf37c8698e13c07da9d9cd (patch)
tree99bd6c3a7a5804df02d5adb4e41eb92a78512d9c /ppapi/proxy/resource_creation_proxy.cc
parent7f531d4d3e00bee23502ba8a9bf229bcfad47dcf (diff)
downloadchromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.zip
chromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.tar.gz
chromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.tar.bz2
Add PPB_FileChooser_Dev to the NaCl IPC proxy.
BUG=116317 TEST=compiles Review URL: https://codereview.chromium.org/11411160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/resource_creation_proxy.cc')
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc48
1 files changed, 24 insertions, 24 deletions
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index bb103c3..8135caf 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -197,23 +197,12 @@ PP_Resource ResourceCreationProxy::CreateAudioConfig(
OBJECT_IS_PROXY, instance, sample_rate, sample_frame_count);
}
-PP_Resource ResourceCreationProxy::CreateImageData(PP_Instance instance,
- PP_ImageDataFormat format,
- const PP_Size& size,
- PP_Bool init_to_zero) {
- return PPB_ImageData_Proxy::CreateProxyResource(instance, format, size,
- init_to_zero);
-}
-
-PP_Resource ResourceCreationProxy::CreateImageDataNaCl(
+PP_Resource ResourceCreationProxy::CreateFileChooser(
PP_Instance instance,
- PP_ImageDataFormat format,
- const PP_Size& size,
- PP_Bool init_to_zero) {
- // These really only are different on the host side. On the plugin side, we
- // always request a "platform" ImageData if we're trusted, or a "NaCl" one
- // if we're untrusted (see PPB_ImageData_Proxy::CreateProxyResource()).
- return CreateImageData(instance, format, size, init_to_zero);
+ PP_FileChooserMode_Dev mode,
+ const char* accept_types) {
+ return (new FileChooserResource(GetConnection(), instance, mode,
+ accept_types))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
@@ -245,6 +234,25 @@ PP_Resource ResourceCreationProxy::CreateHostResolverPrivate(
return PPB_HostResolver_Private_Proxy::CreateProxyResource(instance);
}
+PP_Resource ResourceCreationProxy::CreateImageData(PP_Instance instance,
+ PP_ImageDataFormat format,
+ const PP_Size& size,
+ PP_Bool init_to_zero) {
+ return PPB_ImageData_Proxy::CreateProxyResource(instance, format, size,
+ init_to_zero);
+}
+
+PP_Resource ResourceCreationProxy::CreateImageDataNaCl(
+ PP_Instance instance,
+ PP_ImageDataFormat format,
+ const PP_Size& size,
+ PP_Bool init_to_zero) {
+ // These really only are different on the host side. On the plugin side, we
+ // always request a "platform" ImageData if we're trusted, or a "NaCl" one
+ // if we're untrusted (see PPB_ImageData_Proxy::CreateProxyResource()).
+ return CreateImageData(instance, format, size, init_to_zero);
+}
+
PP_Resource ResourceCreationProxy::CreateNetworkMonitor(
PP_Instance instance,
PPB_NetworkMonitor_Callback callback,
@@ -308,14 +316,6 @@ PP_Resource ResourceCreationProxy::CreateDirectoryReader(
return 0;
}
-PP_Resource ResourceCreationProxy::CreateFileChooser(
- PP_Instance instance,
- PP_FileChooserMode_Dev mode,
- const char* accept_types) {
- return (new FileChooserResource(GetConnection(), instance, mode,
- accept_types))->GetReference();
-}
-
PP_Resource ResourceCreationProxy::CreateFlashDeviceID(PP_Instance instance) {
return (new FlashDeviceIDResource(GetConnection(), instance))->GetReference();
}