| Index: ppapi/thunk/ppb_url_loader_trusted_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_console_thunk.cc b/ppapi/thunk/ppb_url_loader_trusted_thunk.cc
|
| similarity index 39%
|
| copy from ppapi/thunk/ppb_console_thunk.cc
|
| copy to ppapi/thunk/ppb_url_loader_trusted_thunk.cc
|
| index 9af6b203322c4e153afbbbc4de5e372f705c9a10..398c52d539d5a6a280e4cf886594429499aec130 100644
|
| --- a/ppapi/thunk/ppb_console_thunk.cc
|
| +++ b/ppapi/thunk/ppb_url_loader_trusted_thunk.cc
|
| @@ -2,13 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// From ppb_console.idl modified Thu Dec 20 13:10:26 2012.
|
| +// From trusted/ppb_url_loader_trusted.idl modified Wed Apr 17 09:21:10 2013.
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| -#include "ppapi/c/ppb_console.h"
|
| +#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
|
| #include "ppapi/shared_impl/tracked_callback.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "ppapi/thunk/ppb_instance_api.h"
|
| +#include "ppapi/thunk/ppb_url_loader_api.h"
|
| #include "ppapi/thunk/resource_creation_api.h"
|
| #include "ppapi/thunk/thunk.h"
|
|
|
| @@ -17,32 +18,30 @@ namespace thunk {
|
|
|
| namespace {
|
|
|
| -void Log(PP_Instance instance, PP_LogLevel level, struct PP_Var value) {
|
| - VLOG(4) << "PPB_Console::Log()";
|
| - EnterInstance enter(instance);
|
| +void GrantUniversalAccess(PP_Resource loader) {
|
| + VLOG(4) << "PPB_URLLoaderTrusted::GrantUniversalAccess()";
|
| + EnterResource<PPB_URLLoader_API> enter(loader, true);
|
| if (enter.succeeded())
|
| - enter.functions()->Log(instance, level, value);
|
| + enter.object()->GrantUniversalAccess();
|
| }
|
|
|
| -void LogWithSource(PP_Instance instance,
|
| - PP_LogLevel level,
|
| - struct PP_Var source,
|
| - struct PP_Var value) {
|
| - VLOG(4) << "PPB_Console::LogWithSource()";
|
| - EnterInstance enter(instance);
|
| +void RegisterStatusCallback(PP_Resource loader,
|
| + PP_URLLoaderTrusted_StatusCallback cb) {
|
| + VLOG(4) << "PPB_URLLoaderTrusted::RegisterStatusCallback()";
|
| + EnterResource<PPB_URLLoader_API> enter(loader, true);
|
| if (enter.succeeded())
|
| - enter.functions()->LogWithSource(instance, level, source, value);
|
| + enter.object()->RegisterStatusCallback(cb);
|
| }
|
|
|
| -const PPB_Console_1_0 g_ppb_console_thunk_1_0 = {
|
| - &Log,
|
| - &LogWithSource
|
| +const PPB_URLLoaderTrusted_0_3 g_ppb_urlloadertrusted_thunk_0_3 = {
|
| + &GrantUniversalAccess,
|
| + &RegisterStatusCallback
|
| };
|
|
|
| } // namespace
|
|
|
| -const PPB_Console_1_0* GetPPB_Console_1_0_Thunk() {
|
| - return &g_ppb_console_thunk_1_0;
|
| +const PPB_URLLoaderTrusted_0_3* GetPPB_URLLoaderTrusted_0_3_Thunk() {
|
| + return &g_ppb_urlloadertrusted_thunk_0_3;
|
| }
|
|
|
| } // namespace thunk
|
|
|