diff options
| author | ikarienator@chromium.org <ikarienator@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 00:19:10 +0000 |
|---|---|---|
| committer | ikarienator@chromium.org <ikarienator@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 00:19:10 +0000 |
| commit | ea4d18bcd417746286f009a0cadf51ebe408f3de (patch) | |
| tree | 364d037655b6f89300be744ec51bda692eb5c498 /ppapi/thunk | |
| parent | 50106bf5210c384f90a45cad94992ed22f931cac (diff) | |
| download | chromium_src-ea4d18bcd417746286f009a0cadf51ebe408f3de.zip chromium_src-ea4d18bcd417746286f009a0cadf51ebe408f3de.tar.gz chromium_src-ea4d18bcd417746286f009a0cadf51ebe408f3de.tar.bz2 | |
Revert 223482 "Simplify PPB_NetworkMonitor proxy."
> Simplify PPB_NetworkMonitor proxy.
>
> The new proxy is based on ppapi::proxy::PluginResource and
> ppapi::host::ResourceHost which simplifies code significantly. Also
> the permission check is consistent with socket APIs now.
>
> BUG=281781
>
> Review URL: https://chromiumcodereview.appspot.com/23819033
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/23463037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private_no_permissions.h | 5 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_network_list_api.h | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private_no_permissions.h b/ppapi/thunk/interfaces_ppb_private_no_permissions.h index de1faad..13a60d1 100644 --- a/ppapi/thunk/interfaces_ppb_private_no_permissions.h +++ b/ppapi/thunk/interfaces_ppb_private_no_permissions.h @@ -9,6 +9,8 @@ // These interfaces don't require private permissions. However, they only work // for whitelisted origins. +UNPROXIED_API(PPB_NetworkList_Private) +PROXIED_API(PPB_NetworkMonitor_Private) PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1, PPB_HostResolver_Private_0_1) @@ -37,7 +39,8 @@ PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_1_1, PPB_NetAddress_Private_1_1) PROXIED_IFACE(NoAPIName, PPB_NETWORKLIST_PRIVATE_INTERFACE_0_3, PPB_NetworkList_Private_0_3) -PROXIED_IFACE(NoAPIName, PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_3, +PROXIED_IFACE(PPB_NetworkMonitor_Private, + PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_3, PPB_NetworkMonitor_Private_0_3) PROXIED_IFACE(NoAPIName, PPB_EXT_CRXFILESYSTEM_PRIVATE_INTERFACE_0_1, diff --git a/ppapi/thunk/ppb_network_list_api.h b/ppapi/thunk/ppb_network_list_api.h index 661399a..b8fb9a3 100644 --- a/ppapi/thunk/ppb_network_list_api.h +++ b/ppapi/thunk/ppb_network_list_api.h @@ -11,12 +11,20 @@ #include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { + +struct NetworkInfo; +typedef std::vector<NetworkInfo> NetworkList; + namespace thunk { class PPAPI_THUNK_EXPORT PPB_NetworkList_API { public: virtual ~PPB_NetworkList_API() {} + // This function is not exposed through the C API, but returns the + // internal data for easy proxying. + virtual const NetworkList& GetNetworkListData() const = 0; + // Private API virtual uint32_t GetCount() = 0; virtual PP_Var GetName(uint32_t index) = 0; |