Index: ppapi/c/ppb_network_list.h |
diff --git a/ppapi/c/private/ppb_network_list_private.h b/ppapi/c/ppb_network_list.h |
similarity index 73% |
rename from ppapi/c/private/ppb_network_list_private.h |
rename to ppapi/c/ppb_network_list.h |
index 296d0df29d9067a621095b0236bd5f941797c1e1..d7b2265d9e463ab66838bbcf95a2ad5f49993112 100644 |
--- a/ppapi/c/private/ppb_network_list_private.h |
+++ b/ppapi/c/ppb_network_list.h |
@@ -3,12 +3,10 @@ |
* found in the LICENSE file. |
*/ |
-/* From private/ppb_network_list_private.idl, |
- * modified Wed Sep 4 11:42:02 2013. |
- */ |
+/* From ppb_network_list.idl modified Mon Sep 9 11:16:26 2013. */ |
-#ifndef PPAPI_C_PRIVATE_PPB_NETWORK_LIST_PRIVATE_H_ |
-#define PPAPI_C_PRIVATE_PPB_NETWORK_LIST_PRIVATE_H_ |
+#ifndef PPAPI_C_PPB_NETWORK_LIST_H_ |
+#define PPAPI_C_PPB_NETWORK_LIST_H_ |
#include "ppapi/c/pp_array_output.h" |
#include "ppapi/c/pp_bool.h" |
@@ -17,12 +15,12 @@ |
#include "ppapi/c/pp_stdint.h" |
#include "ppapi/c/pp_var.h" |
-#define PPB_NETWORKLIST_PRIVATE_INTERFACE_0_3 "PPB_NetworkList_Private;0.3" |
-#define PPB_NETWORKLIST_PRIVATE_INTERFACE PPB_NETWORKLIST_PRIVATE_INTERFACE_0_3 |
+#define PPB_NETWORKLIST_INTERFACE_1_0 "PPB_NetworkList;1.0" |
+#define PPB_NETWORKLIST_INTERFACE PPB_NETWORKLIST_INTERFACE_1_0 |
/** |
* @file |
- * This file defines the <code>PPB_NetworkList_Private</code> interface. |
+ * This file defines the <code>PPB_NetworkList</code> interface. |
*/ |
@@ -37,21 +35,21 @@ typedef enum { |
/** |
* Type of the network interface is not known. |
*/ |
- PP_NETWORKLIST_UNKNOWN = 0, |
+ PP_NETWORKLIST_TYPE_UNKNOWN = 0, |
/** |
* Wired Ethernet network. |
*/ |
- PP_NETWORKLIST_ETHERNET = 1, |
+ PP_NETWORKLIST_TYPE_ETHERNET = 1, |
/** |
* Wireless Wi-Fi network. |
*/ |
- PP_NETWORKLIST_WIFI = 2, |
+ PP_NETWORKLIST_TYPE_WIFI = 2, |
/** |
* Cellular network (e.g. LTE). |
*/ |
- PP_NETWORKLIST_CELLULAR = 3 |
-} PP_NetworkListType_Private; |
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkListType_Private, 4); |
+ PP_NETWORKLIST_TYPE_CELLULAR = 3 |
+} PP_NetworkList_Type; |
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkList_Type, 4); |
/** |
* State of a network interface. |
@@ -60,13 +58,13 @@ typedef enum { |
/** |
* Network interface is down. |
*/ |
- PP_NETWORKLIST_DOWN = 0, |
+ PP_NETWORKLIST_STATE_DOWN = 0, |
/** |
* Network interface is up. |
*/ |
- PP_NETWORKLIST_UP = 1 |
-} PP_NetworkListState_Private; |
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkListState_Private, 4); |
+ PP_NETWORKLIST_STATE_UP = 1 |
+} PP_NetworkList_State; |
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkList_State, 4); |
/** |
* @} |
*/ |
@@ -76,13 +74,12 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkListState_Private, 4); |
* @{ |
*/ |
/** |
- * The <code>PPB_NetworkList_Private</code> is used to represent a |
- * list of network interfaces and their configuration. The content of |
- * the list is immutable. The current networks configuration can be |
- * received using the <code>PPB_NetworkMonitor_Private</code> |
- * interface. |
+ * The <code>PPB_NetworkList</code> is used to represent a list of |
+ * network interfaces and their configuration. The content of the list |
+ * is immutable. The current networks configuration can be received |
+ * using the <code>PPB_NetworkMonitor</code> interface. |
*/ |
-struct PPB_NetworkList_Private_0_3 { |
+struct PPB_NetworkList_1_0 { |
/** |
* Determines if the specified <code>resource</code> is a |
* <code>NetworkList</code> object. |
@@ -90,7 +87,7 @@ struct PPB_NetworkList_Private_0_3 { |
* @param[in] resource A <code>PP_Resource</code> resource. |
* |
* @return Returns <code>PP_TRUE</code> if <code>resource</code> is |
- * a <code>PPB_NetworkList_Private</code>, <code>PP_FALSE</code> |
+ * a <code>PPB_NetworkList</code>, <code>PP_FALSE</code> |
* otherwise. |
*/ |
PP_Bool (*IsNetworkList)(PP_Resource resource); |
@@ -125,7 +122,7 @@ struct PPB_NetworkList_Private_0_3 { |
* @return Returns type of the network interface with the specified |
* <code>index</code>. |
*/ |
- PP_NetworkListType_Private (*GetType)(PP_Resource resource, uint32_t index); |
+ PP_NetworkList_Type (*GetType)(PP_Resource resource, uint32_t index); |
/** |
* Gets state of a network interface. |
* |
@@ -136,7 +133,7 @@ struct PPB_NetworkList_Private_0_3 { |
* @return Returns current state of the network interface with the |
* specified <code>index</code>. |
*/ |
- PP_NetworkListState_Private (*GetState)(PP_Resource resource, uint32_t index); |
+ PP_NetworkList_State (*GetState)(PP_Resource resource, uint32_t index); |
/** |
* Gets list of IP addresses for a network interface. |
* |
@@ -177,10 +174,10 @@ struct PPB_NetworkList_Private_0_3 { |
uint32_t (*GetMTU)(PP_Resource resource, uint32_t index); |
}; |
-typedef struct PPB_NetworkList_Private_0_3 PPB_NetworkList_Private; |
+typedef struct PPB_NetworkList_1_0 PPB_NetworkList; |
/** |
* @} |
*/ |
-#endif /* PPAPI_C_PRIVATE_PPB_NETWORK_LIST_PRIVATE_H_ */ |
+#endif /* PPAPI_C_PPB_NETWORK_LIST_H_ */ |