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

Side by Side Diff: remoting/host/host_plugin.cc

Issue 7129034: Fix calling convention for Chromoting's NP_Shutdown entry points (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdio.h> 5 #include <stdio.h>
6 #include <string.h> 6 #include <string.h>
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 return NPERR_INCOMPATIBLE_VERSION_ERROR; 924 return NPERR_INCOMPATIBLE_VERSION_ERROR;
925 925
926 g_at_exit_manager = new base::AtExitManager; 926 g_at_exit_manager = new base::AtExitManager;
927 g_npnetscape_funcs = npnetscape_funcs; 927 g_npnetscape_funcs = npnetscape_funcs;
928 #if defined(OS_POSIX) && !defined(OS_MACOSX) 928 #if defined(OS_POSIX) && !defined(OS_MACOSX)
929 NP_GetEntryPoints(nppfuncs); 929 NP_GetEntryPoints(nppfuncs);
930 #endif 930 #endif
931 return NPERR_NO_ERROR; 931 return NPERR_NO_ERROR;
932 } 932 }
933 933
934 EXPORT NPError NP_Shutdown() { 934 EXPORT NPError API_CALL NP_Shutdown() {
935 LOG(INFO) << "NP_Shutdown"; 935 LOG(INFO) << "NP_Shutdown";
936 delete g_at_exit_manager; 936 delete g_at_exit_manager;
937 g_at_exit_manager = NULL; 937 g_at_exit_manager = NULL;
938 return NPERR_NO_ERROR; 938 return NPERR_NO_ERROR;
939 } 939 }
940 940
941 #if defined(OS_POSIX) && !defined(OS_MACOSX) 941 #if defined(OS_POSIX) && !defined(OS_MACOSX)
942 EXPORT const char* API_CALL NP_GetMIMEDescription(void) { 942 EXPORT const char* API_CALL NP_GetMIMEDescription(void) {
943 LOG(INFO) << "NP_GetMIMEDescription"; 943 LOG(INFO) << "NP_GetMIMEDescription";
944 return STRINGIZE(HOST_PLUGIN_MIME_TYPE) ":" 944 return STRINGIZE(HOST_PLUGIN_MIME_TYPE) ":"
945 HOST_PLUGIN_NAME ":" 945 HOST_PLUGIN_NAME ":"
946 HOST_PLUGIN_DESCRIPTION; 946 HOST_PLUGIN_DESCRIPTION;
947 } 947 }
948 948
949 EXPORT NPError API_CALL NP_GetValue(void* npp, 949 EXPORT NPError API_CALL NP_GetValue(void* npp,
950 NPPVariable variable, 950 NPPVariable variable,
951 void* value) { 951 void* value) {
952 return GetValue((NPP)npp, variable, value); 952 return GetValue((NPP)npp, variable, value);
953 } 953 }
954 #endif 954 #endif
955 955
956 } // extern "C" 956 } // extern "C"
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698