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

Side by Side Diff: src/trusted/plugin/nacl_entry_points.cc

Issue 6452010: Remove the x-ppapi-nacl-srpc and x-nacl-srpc mime types in favor of the singl... (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 10 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 | « src/trusted/plugin/build.scons ('k') | src/trusted/plugin/npapi/npp_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 }; 84 };
85 85
86 #if NACL_WINDOWS 86 #if NACL_WINDOWS
87 NaClHandlePassBrowserInit(); 87 NaClHandlePassBrowserInit();
88 #endif 88 #endif
89 89
90 NPAPI::PluginList::Singleton()->RegisterInternalPlugin( 90 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(
91 FilePath(FILE_PATH_LITERAL("internal_nacl")), 91 FilePath(FILE_PATH_LITERAL("internal_nacl")),
92 "Google Native Client", 92 "Google Native Client",
93 "Google Native Client", 93 "Google Native Client",
94 "application/x-nacl-srpc", 94 "application/x-nacl",
95 entry_points); 95 entry_points);
96 } 96 }
97 97
98 // This gets called in the browser process. 98 // This gets called in the browser process.
99 void RegisterInternalNaClPlugin() { 99 void RegisterInternalNaClPlugin() {
100 RegisterCommon(); 100 RegisterCommon();
101 } 101 }
102 102
103 // This gets called in the renderer process. 103 // This gets called in the renderer process.
104 void RegisterInternalNaClPlugin(const std::map<std::string, uintptr_t>& funcs) { 104 void RegisterInternalNaClPlugin(const std::map<std::string, uintptr_t>& funcs) {
105 RegisterCommon(); 105 RegisterCommon();
106 std::map<std::string, uintptr_t>::const_iterator it = 106 std::map<std::string, uintptr_t>::const_iterator it =
107 funcs.find("launch_nacl_process_multi_fd"); 107 funcs.find("launch_nacl_process_multi_fd");
108 if (it != funcs.end()) { 108 if (it != funcs.end()) {
109 launch_nacl_process = reinterpret_cast<LaunchNaClProcessFunc>(it->second); 109 launch_nacl_process = reinterpret_cast<LaunchNaClProcessFunc>(it->second);
110 } 110 }
111 } 111 }
OLDNEW
« no previous file with comments | « src/trusted/plugin/build.scons ('k') | src/trusted/plugin/npapi/npp_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698