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

Side by Side Diff: components/nacl/renderer/nexe_load_manager.h

Issue 836273002: Revert of Remove nonsfi token workaround. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | components/nacl/renderer/nexe_load_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ 5 #ifndef COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_
6 #define COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ 6 #define COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 void set_pnacl_start_time(base::Time time) { 114 void set_pnacl_start_time(base::Time time) {
115 pnacl_start_time_ = time; 115 pnacl_start_time_ = time;
116 } 116 }
117 117
118 const std::string& program_url() const { return program_url_; } 118 const std::string& program_url() const { return program_url_; }
119 119
120 void set_crash_info_shmem_handle(base::SharedMemoryHandle h) { 120 void set_crash_info_shmem_handle(base::SharedMemoryHandle h) {
121 crash_info_shmem_handle_ = h; 121 crash_info_shmem_handle_ = h;
122 } 122 }
123 123
124 bool nonsfi() const { return nonsfi_; }
125 void set_nonsfi(bool nonsfi) { nonsfi_ = nonsfi; }
126
127 private: 124 private:
128 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager); 125 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager);
129 126
130 explicit NexeLoadManager(PP_Instance instance); 127 explicit NexeLoadManager(PP_Instance instance);
131 128
132 void ReportDeadNexe(); 129 void ReportDeadNexe();
133 130
134 // Copies a crash log to the console, one line at a time. 131 // Copies a crash log to the console, one line at a time.
135 void CopyCrashLogToJsConsole(const std::string& crash_log); 132 void CopyCrashLogToJsConsole(const std::string& crash_log);
136 133
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 175
179 // Arguments passed to this plugin instance from the DOM. 176 // Arguments passed to this plugin instance from the DOM.
180 std::map<std::string, std::string> args_; 177 std::map<std::string, std::string> args_;
181 178
182 // We store mime_type_ outside of args_ explicitly because we change it to be 179 // We store mime_type_ outside of args_ explicitly because we change it to be
183 // lowercase. 180 // lowercase.
184 std::string mime_type_; 181 std::string mime_type_;
185 182
186 base::Time pnacl_start_time_; 183 base::Time pnacl_start_time_;
187 184
188 // A flag that indicates if the plugin is using Non-SFI mode.
189 bool nonsfi_;
190
191 base::SharedMemoryHandle crash_info_shmem_handle_; 185 base::SharedMemoryHandle crash_info_shmem_handle_;
192 186
193 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_; 187 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_;
194 scoped_ptr<ManifestServiceChannel> manifest_service_channel_; 188 scoped_ptr<ManifestServiceChannel> manifest_service_channel_;
195 base::WeakPtrFactory<NexeLoadManager> weak_factory_; 189 base::WeakPtrFactory<NexeLoadManager> weak_factory_;
196 }; 190 };
197 191
198 } // namespace nacl 192 } // namespace nacl
199 193
200 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ 194 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | components/nacl/renderer/nexe_load_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698