| Index: ppapi/proxy/ppb_flash_menu_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_flash_menu_proxy.cc (revision 100854)
|
| +++ ppapi/proxy/ppb_flash_menu_proxy.cc (working copy)
|
| @@ -77,16 +77,14 @@
|
|
|
| namespace {
|
|
|
| -InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher,
|
| - const void* target_interface) {
|
| - return new PPB_Flash_Menu_Proxy(dispatcher, target_interface);
|
| +InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher) {
|
| + return new PPB_Flash_Menu_Proxy(dispatcher);
|
| }
|
|
|
| } // namespace
|
|
|
| -PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher,
|
| - const void* target_interface)
|
| - : InterfaceProxy(dispatcher, target_interface),
|
| +PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher)
|
| + : InterfaceProxy(dispatcher),
|
| callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
|
| }
|
|
|
| @@ -144,7 +142,7 @@
|
| void PPB_Flash_Menu_Proxy::OnMsgCreate(PP_Instance instance,
|
| const SerializedFlashMenu& menu_data,
|
| HostResource* result) {
|
| - EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
|
| + thunk::EnterResourceCreation enter(instance);
|
| if (enter.succeeded()) {
|
| result->SetHostResource(
|
| instance,
|
|
|