summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/resource_creation_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-15 05:08:38 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-15 05:08:38 +0000
commitb7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc (patch)
tree7653d8ec53c9f154be07bc7240ad54d0f0f682e6 /ppapi/proxy/resource_creation_proxy.cc
parenta78f03cf0fb7e2053099bcc4b73d558c9d653ed1 (diff)
downloadchromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.zip
chromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.tar.gz
chromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.tar.bz2
Convert the async device ID getter to a chrome resource host
Review URL: https://codereview.chromium.org/10909138 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/resource_creation_proxy.cc')
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index f24f86a..0981b82 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -9,6 +9,7 @@
#include "ppapi/c/trusted/ppb_image_data_trusted.h"
#include "ppapi/proxy/connection.h"
#include "ppapi/proxy/file_chooser_resource.h"
+#include "ppapi/proxy/flash_device_id_resource.h"
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/plugin_globals.h"
#include "ppapi/proxy/plugin_proxy_delegate.h"
@@ -21,7 +22,6 @@
#include "ppapi/proxy/ppb_file_io_proxy.h"
#include "ppapi/proxy/ppb_file_ref_proxy.h"
#include "ppapi/proxy/ppb_file_system_proxy.h"
-#include "ppapi/proxy/ppb_flash_device_id_proxy.h"
#include "ppapi/proxy/ppb_flash_menu_proxy.h"
#include "ppapi/proxy/ppb_flash_message_loop_proxy.h"
#include "ppapi/proxy/ppb_graphics_2d_proxy.h"
@@ -303,7 +303,7 @@ PP_Resource ResourceCreationProxy::CreateFileChooser(
}
PP_Resource ResourceCreationProxy::CreateFlashDeviceID(PP_Instance instance) {
- return PPB_Flash_DeviceID_Proxy::CreateProxyResource(instance);
+ return (new FlashDeviceIDResource(GetConnection(), instance))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateFlashMenu(