diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 20:19:39 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 20:19:39 +0000 |
| commit | 5b9b80e284fb0b6a4885209ade02093aecc7eb86 (patch) | |
| tree | badaaf0bccfb0ea5413c8949250ba50fec420aba /ppapi/thunk | |
| parent | 1769870244a943241f8d34dc01b2d98b4f2b38f4 (diff) | |
| download | chromium_src-5b9b80e284fb0b6a4885209ade02093aecc7eb86.zip chromium_src-5b9b80e284fb0b6a4885209ade02093aecc7eb86.tar.gz chromium_src-5b9b80e284fb0b6a4885209ade02093aecc7eb86.tar.bz2 | |
Out-of-process implementation of the PPB_NetworkMonitor_Private interface.
BUG=114808
Review URL: http://codereview.chromium.org/9677060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private.h | 12 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_network_list_private_api.h | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h index 43776b0..f6cec07 100644 --- a/ppapi/thunk/interfaces_ppb_private.h +++ b/ppapi/thunk/interfaces_ppb_private.h @@ -13,6 +13,8 @@ PROXIED_API(PPB_Talk_Private) PROXIED_API(PPB_TCPServerSocket_Private) PROXIED_API(PPB_TCPSocket_Private) PROXIED_API(PPB_UDPSocket_Private) +UNPROXIED_API(PPB_NetworkList_Private) +PROXIED_API(PPB_NetworkMonitor_Private) PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted_0_2) @@ -45,11 +47,11 @@ PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2, PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3, PPB_UDPSocket_Private_0_3) -UNPROXIED_IFACE(PPB_NetworkList_Private, PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2, - PPB_NetworkList_Private_0_2) -UNPROXIED_IFACE(PPB_NetworkMonitor_Private, - PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_2, - PPB_NetworkMonitor_Private_0_2) +PROXIED_IFACE(NoAPIName, PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2, + PPB_NetworkList_Private_0_2) +PROXIED_IFACE(PPB_NetworkMonitor_Private, + PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_2, + PPB_NetworkMonitor_Private_0_2) // Hack to keep font working. The Font 0.6 API is binary compatible with // BrowserFont 1.0, so just map the string to the same thing. diff --git a/ppapi/thunk/ppb_network_list_private_api.h b/ppapi/thunk/ppb_network_list_private_api.h index fbe57f0..ea91349 100644 --- a/ppapi/thunk/ppb_network_list_private_api.h +++ b/ppapi/thunk/ppb_network_list_private_api.h @@ -5,16 +5,26 @@ #ifndef PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_ #define PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_ +#include <vector> + #include "ppapi/c/private/ppb_network_list_private.h" #include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { + +struct NetworkInfo; +typedef std::vector<NetworkInfo> NetworkList; + namespace thunk { class PPAPI_THUNK_EXPORT PPB_NetworkList_Private_API { public: virtual ~PPB_NetworkList_Private_API() {} + // This function is not exposed through the C API, but returns the + // internal data for easy proxying. + virtual const NetworkList& GetNetworkListData() const = 0; + virtual uint32_t GetCount() = 0; virtual PP_Var GetName(uint32_t index) = 0; virtual PP_NetworkListType_Private GetType(uint32_t index) = 0; |