diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:10:57 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:10:57 +0000 |
| commit | cd57d088c61b38881261c159792537e8b93eb6b8 (patch) | |
| tree | b8623b5600833d4deeaca2b1617655c4ad2395c2 /ppapi/proxy/ppb_instance_proxy.cc | |
| parent | 199e9257d7e6da23084e5ce1d971612bf8ad4c5a (diff) | |
| download | chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.zip chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.tar.gz chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.tar.bz2 | |
Revert 171389
The revert is causing browser tests to fail. Reverting the revert.
> Revert 171080
>
> > The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal.
> >
> > Review URL: https://codereview.chromium.org/11359097
>
> TBR=raymes@chromium.org
>
> Review URL: https://codereview.chromium.org/11437038
TBR=raymes@chromium.org
Review URL: https://codereview.chromium.org/11450025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 4e32822..d81fb8e 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -17,6 +17,7 @@ #include "ppapi/proxy/content_decryptor_private_serializer.h" #include "ppapi/proxy/enter_proxy.h" #include "ppapi/proxy/flash_clipboard_resource.h" +#include "ppapi/proxy/flash_file_resource.h" #include "ppapi/proxy/flash_fullscreen_resource.h" #include "ppapi/proxy/flash_resource.h" #include "ppapi/proxy/gamepad_resource.h" @@ -382,6 +383,9 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance, case FLASH_CLIPBOARD_SINGLETON_ID: new_singleton = new FlashClipboardResource(connection, instance); break; + case FLASH_FILE_SINGLETON_ID: + new_singleton = new FlashFileResource(connection, instance); + break; case FLASH_FULLSCREEN_SINGLETON_ID: new_singleton = new FlashFullscreenResource(connection, instance); break; @@ -390,6 +394,7 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance, break; #else case FLASH_CLIPBOARD_SINGLETON_ID: + case FLASH_FILE_SINGLETON_ID: case FLASH_FULLSCREEN_SINGLETON_ID: case FLASH_SINGLETON_ID: NOTREACHED(); |