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

Side by Side Diff: chrome/common/nacl_types.h

Issue 11761025: When launching PNaCl helper nexes, explicitly disable IRT loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't forget to serialize Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/nacl_messages.h ('k') | chrome/common/nacl_types.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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_COMMON_NACL_TYPES_H_ 5 #ifndef CHROME_COMMON_NACL_TYPES_H_
6 #define CHROME_COMMON_NACL_TYPES_H_ 6 #define CHROME_COMMON_NACL_TYPES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 bool validation_cache_enabled; 50 bool validation_cache_enabled;
51 std::string validation_cache_key; 51 std::string validation_cache_key;
52 // Chrome version string. Sending the version string over IPC avoids linkage 52 // Chrome version string. Sending the version string over IPC avoids linkage
53 // issues in cases where NaCl is not compiled into the main Chromium 53 // issues in cases where NaCl is not compiled into the main Chromium
54 // executable or DLL. 54 // executable or DLL.
55 std::string version; 55 std::string version;
56 56
57 bool enable_exception_handling; 57 bool enable_exception_handling;
58 bool enable_debug_stub; 58 bool enable_debug_stub;
59 bool enable_ipc_proxy; 59 bool enable_ipc_proxy;
60 bool uses_irt;
60 }; 61 };
61 62
62 // Parameters sent to the browser process to have it launch a NaCl process. 63 // Parameters sent to the browser process to have it launch a NaCl process.
63 // 64 //
64 // If you change this, you will also need to update the IPC serialization in 65 // If you change this, you will also need to update the IPC serialization in
65 // renderer_messages.h. 66 // renderer_messages.h.
66 struct NaClLaunchParams { 67 struct NaClLaunchParams {
67 NaClLaunchParams(); 68 NaClLaunchParams();
68 NaClLaunchParams(const std::string& u, int r, uint32 p); 69 NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt);
69 NaClLaunchParams(const NaClLaunchParams& l); 70 NaClLaunchParams(const NaClLaunchParams& l);
70 ~NaClLaunchParams(); 71 ~NaClLaunchParams();
71 72
72 std::string manifest_url; 73 std::string manifest_url;
73 int render_view_id; 74 int render_view_id;
74 uint32 permission_bits; 75 uint32 permission_bits;
76 bool uses_irt;
75 }; 77 };
76 78
77 } // namespace nacl 79 } // namespace nacl
78 80
79 #endif // CHROME_COMMON_NACL_TYPES_H_ 81 #endif // CHROME_COMMON_NACL_TYPES_H_
OLDNEW
« no previous file with comments | « chrome/common/nacl_messages.h ('k') | chrome/common/nacl_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698