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

Side by Side Diff: child_job.h

Issue 6882055: Revert "Add support for removing and adding --dom-login from arguments" (Closed) Base URL: http://git.chromium.org/git/login_manager.git@master
Patch Set: Created 9 years, 8 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 | « no previous file | child_job.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) 2009-2010 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009-2010 The Chromium OS 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 LOGIN_MANAGER_CHILD_JOB_H_ 5 #ifndef LOGIN_MANAGER_CHILD_JOB_H_
6 #define LOGIN_MANAGER_CHILD_JOB_H_ 6 #define LOGIN_MANAGER_CHILD_JOB_H_
7 7
8 #include <gtest/gtest.h> 8 #include <gtest/gtest.h>
9 #include <time.h> 9 #include <time.h>
10 #include <unistd.h> 10 #include <unistd.h>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual void SetDesiredUid(uid_t uid); 92 virtual void SetDesiredUid(uid_t uid);
93 virtual bool IsDesiredUidSet() const; 93 virtual bool IsDesiredUidSet() const;
94 virtual const std::string GetName() const; 94 virtual const std::string GetName() const;
95 virtual void SetArguments(const std::string& arguments); 95 virtual void SetArguments(const std::string& arguments);
96 virtual void SetExtraArguments(const std::vector<std::string>& arguments); 96 virtual void SetExtraArguments(const std::vector<std::string>& arguments);
97 97
98 // The flag to pass to chrome to tell it to behave as the login manager. 98 // The flag to pass to chrome to tell it to behave as the login manager.
99 static const char kLoginManagerFlag[]; 99 static const char kLoginManagerFlag[];
100 // The flag to pass to chrome to tell it which user has logged in. 100 // The flag to pass to chrome to tell it which user has logged in.
101 static const char kLoginUserFlag[]; 101 static const char kLoginUserFlag[];
102 static const char kDOMLoginFlag[];
103 // The flag to pass to chrome when starting "Browse Without Sign In" mode. 102 // The flag to pass to chrome when starting "Browse Without Sign In" mode.
104 static const char kBWSIFlag[]; 103 static const char kBWSIFlag[];
105 // Suffix matched against each job's argv[0] to determine if it's the window 104 // Suffix matched against each job's argv[0] to determine if it's the window
106 // manager. 105 // manager.
107 static const char kWindowManagerSuffix[]; 106 static const char kWindowManagerSuffix[];
108 107
109 // Minimum amount of time (in seconds) that should pass since the job was 108 // Minimum amount of time (in seconds) that should pass since the job was
110 // started for it to be restarted if it exits or crashes. 109 // started for it to be restarted if it exits or crashes.
111 static const int kRestartWindow; 110 static const int kRestartWindow;
112 111
(...skipping 25 matching lines...) Expand all
138 137
139 // Indicates if |desired_uid_| was initialized. 138 // Indicates if |desired_uid_| was initialized.
140 bool is_desired_uid_set_; 139 bool is_desired_uid_set_;
141 140
142 // The last time the job was run. 141 // The last time the job was run.
143 time_t last_start_; 142 time_t last_start_;
144 143
145 // Indicates if we removed login manager flag when session started so we 144 // Indicates if we removed login manager flag when session started so we
146 // add it back when session stops. 145 // add it back when session stops.
147 bool removed_login_manager_flag_; 146 bool removed_login_manager_flag_;
148 bool removed_dom_login_flag_;
149 147
150 FRIEND_TEST(ChildJobTest, InitializationTest); 148 FRIEND_TEST(ChildJobTest, InitializationTest);
151 FRIEND_TEST(ChildJobTest, ShouldStopTest); 149 FRIEND_TEST(ChildJobTest, ShouldStopTest);
152 FRIEND_TEST(ChildJobTest, ShouldNotStopTest); 150 FRIEND_TEST(ChildJobTest, ShouldNotStopTest);
153 FRIEND_TEST(ChildJobTest, StartStopSessionTest); 151 FRIEND_TEST(ChildJobTest, StartStopSessionTest);
154 FRIEND_TEST(ChildJobTest, StartStopSessionFromLoginTest); 152 FRIEND_TEST(ChildJobTest, StartStopSessionFromLoginTest);
155 FRIEND_TEST(ChildJobTest, SetArguments); 153 FRIEND_TEST(ChildJobTest, SetArguments);
156 FRIEND_TEST(ChildJobTest, SetExtraArguments); 154 FRIEND_TEST(ChildJobTest, SetExtraArguments);
157 FRIEND_TEST(ChildJobTest, CreateArgv); 155 FRIEND_TEST(ChildJobTest, CreateArgv);
158 DISALLOW_COPY_AND_ASSIGN(ChildJob); 156 DISALLOW_COPY_AND_ASSIGN(ChildJob);
159 }; 157 };
160 158
161 } // namespace login_manager 159 } // namespace login_manager
162 160
163 #endif // LOGIN_MANAGER_CHILD_JOB_H_ 161 #endif // LOGIN_MANAGER_CHILD_JOB_H_
OLDNEW
« no previous file with comments | « no previous file | child_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698