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

Side by Side Diff: components/nacl/zygote/nacl_fork_delegate_linux.h

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_ 5 #ifndef COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_
6 #define COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_ 6 #define COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 18 matching lines...) Expand all
29 // The NaClForkDelegate is created during Chrome linux zygote 29 // The NaClForkDelegate is created during Chrome linux zygote
30 // initialization, and provides "fork()" functionality with 30 // initialization, and provides "fork()" functionality with
31 // NaCl specific process characteristics (specifically address 31 // NaCl specific process characteristics (specifically address
32 // space layout) as an alternative to forking the zygote. 32 // space layout) as an alternative to forking the zygote.
33 // A new delegate is passed in as an argument to ZygoteMain(). 33 // A new delegate is passed in as an argument to ZygoteMain().
34 class NaClForkDelegate : public content::ZygoteForkDelegate { 34 class NaClForkDelegate : public content::ZygoteForkDelegate {
35 public: 35 public:
36 explicit NaClForkDelegate(bool nonsfi_mode); 36 explicit NaClForkDelegate(bool nonsfi_mode);
37 virtual ~NaClForkDelegate(); 37 virtual ~NaClForkDelegate();
38 38
39 virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) OVERRIDE; 39 virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
40 virtual void InitialUMA(std::string* uma_name, 40 virtual void InitialUMA(std::string* uma_name,
41 int* uma_sample, 41 int* uma_sample,
42 int* uma_boundary_value) OVERRIDE; 42 int* uma_boundary_value) override;
43 virtual bool CanHelp(const std::string& process_type, std::string* uma_name, 43 virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
44 int* uma_sample, int* uma_boundary_value) OVERRIDE; 44 int* uma_sample, int* uma_boundary_value) override;
45 virtual pid_t Fork(const std::string& process_type, 45 virtual pid_t Fork(const std::string& process_type,
46 const std::vector<int>& fds, 46 const std::vector<int>& fds,
47 const std::string& channel_id) OVERRIDE; 47 const std::string& channel_id) override;
48 virtual bool GetTerminationStatus(pid_t pid, bool known_dead, 48 virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
49 base::TerminationStatus* status, 49 base::TerminationStatus* status,
50 int* exit_code) OVERRIDE; 50 int* exit_code) override;
51 51
52 private: 52 private:
53 static void AddPassthroughEnvToOptions(base::LaunchOptions* options); 53 static void AddPassthroughEnvToOptions(base::LaunchOptions* options);
54 54
55 // These values are reported via UMA and hence they become permanent 55 // These values are reported via UMA and hence they become permanent
56 // constants. Old values cannot be reused, only new ones added. 56 // constants. Old values cannot be reused, only new ones added.
57 enum NaClHelperStatus { 57 enum NaClHelperStatus {
58 kNaClHelperUnused = 0, 58 kNaClHelperUnused = 0,
59 kNaClHelperMissing = 1, 59 kNaClHelperMissing = 1,
60 kNaClHelperBootstrapMissing = 2, 60 kNaClHelperBootstrapMissing = 2,
61 kNaClHelperValgrind = 3, 61 kNaClHelperValgrind = 3,
62 kNaClHelperLaunchFailed = 4, 62 kNaClHelperLaunchFailed = 4,
63 kNaClHelperAckFailed = 5, 63 kNaClHelperAckFailed = 5,
64 kNaClHelperSuccess = 6, 64 kNaClHelperSuccess = 6,
65 kNaClHelperStatusBoundary // Must be one greater than highest value used. 65 kNaClHelperStatusBoundary // Must be one greater than highest value used.
66 }; 66 };
67 67
68 const bool nonsfi_mode_; 68 const bool nonsfi_mode_;
69 NaClHelperStatus status_; 69 NaClHelperStatus status_;
70 int fd_; 70 int fd_;
71 71
72 FRIEND_TEST_ALL_PREFIXES(NaClForkDelegateLinuxTest, EnvPassthrough); 72 FRIEND_TEST_ALL_PREFIXES(NaClForkDelegateLinuxTest, EnvPassthrough);
73 73
74 DISALLOW_COPY_AND_ASSIGN(NaClForkDelegate); 74 DISALLOW_COPY_AND_ASSIGN(NaClForkDelegate);
75 }; 75 };
76 76
77 } // namespace nacl 77 } // namespace nacl
78 78
79 #endif // COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_ 79 #endif // COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698