diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 03:32:57 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 03:32:57 +0000 |
| commit | db16e6d31233c4c683fdd3d1990c0576f8790317 (patch) | |
| tree | 16c92995534ce061eed53afb5c201ced90a1ee4d /ppapi/thunk | |
| parent | 51d3085e509e92a619aa620ac8f2a02f8578a29b (diff) | |
| download | chromium_src-db16e6d31233c4c683fdd3d1990c0576f8790317.zip chromium_src-db16e6d31233c4c683fdd3d1990c0576f8790317.tar.gz chromium_src-db16e6d31233c4c683fdd3d1990c0576f8790317.tar.bz2 | |
Refactored PPB_Flash GetSettings to the new pepper resource model
This also removes unnecessary code from the PluginDelegate and PepperMessageFilter.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11413200
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/ppb_flash_api.h | 1 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_functions_api.h | 4 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_thunk.cc | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ppapi/thunk/ppb_flash_api.h b/ppapi/thunk/ppb_flash_api.h index 4314550..2f57aea 100644 --- a/ppapi/thunk/ppb_flash_api.h +++ b/ppapi/thunk/ppb_flash_api.h @@ -55,7 +55,6 @@ class PPAPI_THUNK_EXPORT PPB_Flash_API { PP_Bool from_user_action) = 0; virtual PP_Bool IsRectTopmost(PP_Instance instance, const PP_Rect* rect) = 0; - virtual PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) = 0; }; } // namespace thunk diff --git a/ppapi/thunk/ppb_flash_functions_api.h b/ppapi/thunk/ppb_flash_functions_api.h index 69f50108..ae15623 100644 --- a/ppapi/thunk/ppb_flash_functions_api.h +++ b/ppapi/thunk/ppb_flash_functions_api.h @@ -24,10 +24,10 @@ class PPAPI_THUNK_EXPORT PPB_Flash_Functions_API { virtual PP_Var GetProxyForURL(PP_Instance instance, const std::string& url) = 0; virtual void UpdateActivity(PP_Instance instance) = 0; - virtual PP_Bool SetCrashData(PP_Instance instance, - PP_FlashCrashKey key, + virtual PP_Bool SetCrashData(PP_Instance instance, PP_FlashCrashKey key, PP_Var value) = 0; virtual double GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) = 0; + virtual PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) = 0; static const SingletonResourceID kSingletonResourceID = FLASH_SINGLETON_ID; }; diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc index 1f809eb..b9735f4 100644 --- a/ppapi/thunk/ppb_flash_thunk.cc +++ b/ppapi/thunk/ppb_flash_thunk.cc @@ -61,7 +61,7 @@ int32_t Navigate(PP_Resource request_id, // To work around this, use the PP_Instance from the resource. PP_Instance instance; { - thunk::EnterResource<thunk::PPB_URLRequestInfo_API> enter(request_id, true); + EnterResource<PPB_URLRequestInfo_API> enter(request_id, true); if (enter.failed()) return PP_ERROR_BADRESOURCE; instance = enter.resource()->pp_instance(); @@ -138,10 +138,10 @@ int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) { } PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) { - EnterInstance enter(instance); + EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance); if (enter.failed()) return PP_MakeUndefined(); - return enter.functions()->GetFlashAPI()->GetSetting(instance, setting); + return enter.functions()->GetSetting(instance, setting); } PP_Bool SetCrashData(PP_Instance instance, @@ -156,7 +156,7 @@ PP_Bool SetCrashData(PP_Instance instance, int32_t EnumerateVideoCaptureDevices(PP_Instance instance, PP_Resource video_capture, PP_ArrayOutput devices) { - thunk::EnterResource<thunk::PPB_VideoCapture_API> enter(video_capture, true); + EnterResource<PPB_VideoCapture_API> enter(video_capture, true); if (enter.failed()) return enter.retval(); return enter.object()->EnumerateDevicesSync(devices); |