| Index: ppapi/proxy/dispatcher.h
|
| diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h
|
| index 3bd85981f87a01ad8127f8a5825dece5d908a9e5..7bb2c7ec2a791d4ef0ca0b7ee9e16f88d6bd71d6 100644
|
| --- a/ppapi/proxy/dispatcher.h
|
| +++ b/ppapi/proxy/dispatcher.h
|
| @@ -83,8 +83,11 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel {
|
| return local_get_interface_;
|
| }
|
|
|
| + const PpapiPermissions& permissions() const { return permissions_; }
|
| +
|
| protected:
|
| - explicit Dispatcher(PP_GetInterface_Func local_get_interface);
|
| + explicit Dispatcher(PP_GetInterface_Func local_get_interface,
|
| + const PpapiPermissions& permissions);
|
|
|
| // Setter for the derived classes to set the appropriate var serialization.
|
| // Takes one reference of the given pointer, which must be on the heap.
|
| @@ -94,10 +97,6 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel {
|
| // default implementation does nothing, derived classes can override.
|
| virtual void OnInvalidMessageReceived();
|
|
|
| - bool disallow_trusted_interfaces() const {
|
| - return disallow_trusted_interfaces_;
|
| - }
|
| -
|
| protected:
|
| std::vector<IPC::Listener*> filters_;
|
|
|
| @@ -114,6 +113,8 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel {
|
|
|
| scoped_refptr<VarSerializationRules> serialization_rules_;
|
|
|
| + PpapiPermissions permissions_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(Dispatcher);
|
| };
|
|
|
|
|