diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 04:15:10 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 04:15:10 +0000 |
| commit | 07d0a6bf3c7b947e76ac2d05649fb5e8ebce6f6e (patch) | |
| tree | e4489dcaa64a9a09a7d3aff67c0f9c5c4743fa36 /ppapi/thunk | |
| parent | f27ebb8c25f88e5caea6ff3bc184b6ec47d369bc (diff) | |
| download | chromium_src-07d0a6bf3c7b947e76ac2d05649fb5e8ebce6f6e.zip chromium_src-07d0a6bf3c7b947e76ac2d05649fb5e8ebce6f6e.tar.gz chromium_src-07d0a6bf3c7b947e76ac2d05649fb5e8ebce6f6e.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=223482
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=223494
R=brettw@chromium.org, yzshen@chromium.org
Review URL: https://codereview.chromium.org/23819033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223535 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, 1 insertions, 12 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private_no_permissions.h b/ppapi/thunk/interfaces_ppb_private_no_permissions.h index 13a60d1..de1faad 100644 --- a/ppapi/thunk/interfaces_ppb_private_no_permissions.h +++ b/ppapi/thunk/interfaces_ppb_private_no_permissions.h @@ -9,8 +9,6 @@ // 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) @@ -39,8 +37,7 @@ 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(PPB_NetworkMonitor_Private, - PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_3, +PROXIED_IFACE(NoAPIName, 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 b8fb9a3..661399a 100644 --- a/ppapi/thunk/ppb_network_list_api.h +++ b/ppapi/thunk/ppb_network_list_api.h @@ -11,20 +11,12 @@ #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; |