| Index: content/ppapi_plugin/ppapi_thread.h
|
| diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
|
| index 03298097f6059880f9d43e9491cf6c3364a5ba80..8c6185a931cd0d33a39423e373c0d9982b86edd0 100644
|
| --- a/content/ppapi_plugin/ppapi_thread.h
|
| +++ b/content/ppapi_plugin/ppapi_thread.h
|
| @@ -67,7 +67,8 @@ class PpapiThread : public ChildThread,
|
| virtual void SetActiveURL(const std::string& url) OVERRIDE;
|
|
|
| // Message handlers.
|
| - void OnMsgLoadPlugin(const FilePath& path);
|
| + void OnMsgLoadPlugin(const FilePath& path,
|
| + const ppapi::PpapiPermissions& permissions);
|
| void OnMsgCreateChannel(int renderer_id,
|
| bool incognito);
|
| void OnMsgResourceReply(
|
| @@ -90,6 +91,8 @@ class PpapiThread : public ChildThread,
|
|
|
| base::ScopedNativeLibrary library_;
|
|
|
| + ppapi::PpapiPermissions permissions_;
|
| +
|
| // Global state tracking for the proxy.
|
| ppapi::proxy::PluginGlobals plugin_globals_;
|
|
|
|
|