Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1918)

Unified Diff: ppapi/thunk/ppb_websocket_thunk.cc

Issue 9192009: WebSocket Pepper API: make the API out of dev (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for land Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/ppb_websocket_api.h ('k') | ppapi/thunk/resource_creation_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_websocket_thunk.cc
diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc
index ea67f846d32d5027617aa07820282f3074ab35d2..1fcae10d28cd8468b3e9ce948a834acecd393483 100644
--- a/ppapi/thunk/ppb_websocket_thunk.cc
+++ b/ppapi/thunk/ppb_websocket_thunk.cc
@@ -110,10 +110,10 @@ PP_Var GetProtocol(PP_Resource resource) {
return enter.object()->GetProtocol();
}
-PP_WebSocketReadyState_Dev GetReadyState(PP_Resource resource) {
+PP_WebSocketReadyState GetReadyState(PP_Resource resource) {
EnterResource<PPB_WebSocket_API> enter(resource, false);
if (enter.failed())
- return PP_WEBSOCKETREADYSTATE_INVALID_DEV;
+ return PP_WEBSOCKETREADYSTATE_INVALID;
return enter.object()->GetReadyState();
}
@@ -124,7 +124,7 @@ PP_Var GetURL(PP_Resource resource) {
return enter.object()->GetURL();
}
-const PPB_WebSocket_Dev_0_1 g_ppb_websocket_0_1_thunk = {
+const PPB_WebSocket_1_0 g_ppb_websocket_1_0_thunk = {
&Create,
&IsWebSocket,
&Connect,
@@ -143,8 +143,8 @@ const PPB_WebSocket_Dev_0_1 g_ppb_websocket_0_1_thunk = {
} // namespace
-const PPB_WebSocket_Dev_0_1* GetPPB_WebSocket_Dev_0_1_Thunk() {
- return &g_ppb_websocket_0_1_thunk;
+const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() {
+ return &g_ppb_websocket_1_0_thunk;
}
} // namespace thunk
« no previous file with comments | « ppapi/thunk/ppb_websocket_api.h ('k') | ppapi/thunk/resource_creation_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698