| Index: ppapi/proxy/ppb_flash_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
|
| index 227fda1afcab5520b348ef439689f8d249c0ec4e..d99a816b7237f7caa75dc5325ea22630055ad69e 100644
|
| --- a/ppapi/proxy/ppb_flash_proxy.cc
|
| +++ b/ppapi/proxy/ppb_flash_proxy.cc
|
| @@ -126,6 +126,8 @@ bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) {
|
| OnHostMsgGetDeviceID)
|
| IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_InvokePrinting,
|
| OnHostMsgInvokePrinting)
|
| + IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetSetting,
|
| + OnHostMsgGetSetting)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| // TODO(brettw) handle bad messages!
|
| @@ -304,6 +306,12 @@ PP_Var PPB_Flash_Proxy::GetSetting(PP_Instance instance,
|
| PluginGlobals::Get()->plugin_proxy_delegate()->GetUILanguage());
|
| case PP_FLASHSETTING_NUMCORES:
|
| return PP_MakeInt32(plugin_dispatcher->preferences().number_of_cpu_cores);
|
| + case PP_FLASHSETTING_LSORESTRICTIONS: {
|
| + ReceiveSerializedVarReturnValue result;
|
| + dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetSetting(
|
| + API_ID_PPB_FLASH, instance, setting, &result));
|
| + return result.Return(dispatcher());
|
| + }
|
| }
|
| return PP_MakeUndefined();
|
| }
|
| @@ -831,6 +839,19 @@ void PPB_Flash_Proxy::OnHostMsgQueryFileRef(
|
| instance, host_resource.host_resource(), info);
|
| }
|
|
|
| +void PPB_Flash_Proxy::OnHostMsgGetSetting(PP_Instance instance,
|
| + PP_FlashSetting setting,
|
| + SerializedVarReturnValue id) {
|
| + EnterInstanceNoLock enter(instance);
|
| + if (enter.succeeded()) {
|
| + id.Return(dispatcher(),
|
| + enter.functions()->GetFlashAPI()->GetSetting(
|
| + instance, setting));
|
| + } else {
|
| + id.Return(dispatcher(), PP_MakeUndefined());
|
| + }
|
| +}
|
| +
|
| void PPB_Flash_Proxy::OnHostMsgGetDeviceID(PP_Instance instance,
|
| SerializedVarReturnValue id) {
|
| EnterInstanceNoLock enter(instance);
|
|
|