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

Unified Diff: ppapi/thunk/ppb_messaging_thunk.cc

Issue 1014723007: Remove deprecated PPB_Messaging_1_1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove from interfaces_ppb_public_dev_channel.h and histograms.xml Created 5 years, 9 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
Index: ppapi/thunk/ppb_messaging_thunk.cc
diff --git a/ppapi/thunk/ppb_messaging_thunk.cc b/ppapi/thunk/ppb_messaging_thunk.cc
index 1d5d0418287c312f35c5dad78d7d37857ffb61ea..94ba4aa1fba51f796fb1c4b9b9865941f40826fd 100644
--- a/ppapi/thunk/ppb_messaging_thunk.cc
+++ b/ppapi/thunk/ppb_messaging_thunk.cc
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_messaging.idl modified Wed Sep 10 15:41:14 2014.
+// From ppb_messaging.idl modified Tue Mar 24 16:53:47 2015.
-#include "ppapi/c/dev/ppb_messaging_deprecated.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppb_messaging.h"
#include "ppapi/shared_impl/tracked_callback.h"
@@ -24,32 +23,15 @@ void PostMessage(PP_Instance instance, struct PP_Var message) {
enter.functions()->PostMessage(instance, message);
}
-int32_t RegisterMessageHandler_1_1_Deprecated(
- PP_Instance instance,
- void* user_data,
- const struct PPP_MessageHandler_0_1_Deprecated* handler,
- PP_Resource message_loop) {
- VLOG(4) << "PPB_Messaging::RegisterMessageHandler_1_1()";
- EnterInstance enter(instance);
- if (enter.failed())
- return enter.retval();
- return enter.functions()->RegisterMessageHandler_1_1_Deprecated(instance,
- user_data,
- handler,
- message_loop);
-}
-
-int32_t RegisterMessageHandler_1_2(PP_Instance instance,
- void* user_data,
- const struct PPP_MessageHandler_0_2* handler,
- PP_Resource message_loop) {
+int32_t RegisterMessageHandler(PP_Instance instance,
+ void* user_data,
+ const struct PPP_MessageHandler_0_2* handler,
+ PP_Resource message_loop) {
VLOG(4) << "PPB_Messaging::RegisterMessageHandler()";
EnterInstance enter(instance);
if (enter.failed())
return enter.retval();
- return enter.functions()->RegisterMessageHandler(instance,
- user_data,
- handler,
+ return enter.functions()->RegisterMessageHandler(instance, user_data, handler,
message_loop);
}
@@ -61,21 +43,11 @@ void UnregisterMessageHandler(PP_Instance instance) {
enter.functions()->UnregisterMessageHandler(instance);
}
-const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {
- &PostMessage
-};
-
-const PPB_Messaging_1_1_Deprecated g_ppb_messaging_thunk_1_1_deprecated = {
- &PostMessage,
- &RegisterMessageHandler_1_1_Deprecated,
- &UnregisterMessageHandler
-};
+const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {&PostMessage};
-const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {
- &PostMessage,
- &RegisterMessageHandler_1_2,
- &UnregisterMessageHandler
-};
+const PPB_Messaging_1_2 g_ppb_messaging_thunk_1_2 = {&PostMessage,
+ &RegisterMessageHandler,
+ &UnregisterMessageHandler};
} // namespace
@@ -83,11 +55,6 @@ PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
return &g_ppb_messaging_thunk_1_0;
}
-PPAPI_THUNK_EXPORT
-const PPB_Messaging_1_1_Deprecated* GetPPB_Messaging_1_1_Deprecated_Thunk() {
- return &g_ppb_messaging_thunk_1_1_deprecated;
-}
-
PPAPI_THUNK_EXPORT const PPB_Messaging_1_2* GetPPB_Messaging_1_2_Thunk() {
return &g_ppb_messaging_thunk_1_2;
}

Powered by Google App Engine
This is Rietveld 408576698