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

Unified Diff: components/nacl/zygote/nacl_fork_delegate_linux.h

Issue 216603002: Tell nacl_helper to use non SFI mode in HandleForkRequest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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: components/nacl/zygote/nacl_fork_delegate_linux.h
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.h b/components/nacl/zygote/nacl_fork_delegate_linux.h
index a5ec534aa21ebcb9339eeb2877336e37a830f207..3829e8afa3f036771dbc621296e0095b07798cf3 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.h
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
@@ -28,7 +28,8 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
int* uma_boundary_value) OVERRIDE;
virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
int* uma_sample, int* uma_boundary_value) OVERRIDE;
- virtual pid_t Fork(const std::vector<int>& fds) OVERRIDE;
+ virtual pid_t Fork(const std::string& process_type,
+ const std::vector<int>& fds) OVERRIDE;
virtual bool AckChild(int fd,
const std::string& channel_switch) OVERRIDE;
virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
@@ -51,6 +52,7 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
NaClHelperStatus status_;
int fd_;
+ bool uses_nonsfi_mode_;
Mark Seaborn 2014/03/31 17:19:59 Not used any more
hamaji 2014/04/01 06:53:09 Done.
};
#endif // COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_

Powered by Google App Engine
This is Rietveld 408576698