Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 5 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 | 172 |
| 173 // Returns true if |profile| has exited uncleanly and has not been launched | 173 // Returns true if |profile| has exited uncleanly and has not been launched |
| 174 // after the unclean exit. | 174 // after the unclean exit. |
| 175 bool HasPendingUncleanExit(Profile* profile); | 175 bool HasPendingUncleanExit(Profile* profile); |
| 176 | 176 |
| 177 // Returns the path that contains the profile that should be loaded on process | 177 // Returns the path that contains the profile that should be loaded on process |
| 178 // startup. | 178 // startup. |
| 179 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir, | 179 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir, |
| 180 const base::CommandLine& command_line); | 180 const base::CommandLine& command_line); |
| 181 | 181 |
| 182 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| 183 // Returns the profile that should be loaded on process startup. This is either | |
| 184 // the profile return by GetStartupProfilePath, or the guest profile if the | |
|
Peter Kasting
2016/07/01 00:53:23
Nit: returned
WC Leung
2016/07/07 17:01:54
Done.
| |
| 185 // above profile is locked. The guest profile denotes that we should open the | |
| 186 // user manager. Returns null if the above profile cannot be opened. In case of | |
|
Peter Kasting
2016/07/01 00:53:23
Why does returning the guest profile denote openin
WC Leung
2016/07/07 17:01:54
I suggest a structure with an enum and a Profile*.
Peter Kasting
2016/07/11 02:58:59
Hmm. Sounds like this does need cleanup, and you'
| |
| 187 // user manager, returns null if either the guest profile and the system profile | |
|
Peter Kasting
2016/07/01 00:53:24
Nit: Do you mean "neither/nor...can be opened"? H
WC Leung
2016/07/07 17:01:54
I do really mean "either".
If the guest profile c
Peter Kasting
2016/07/11 02:58:59
Then I think you meant to use "either...or" instea
WC Leung
2016/07/18 17:56:18
Done. Sorry for this stupid mistake.
| |
| 188 // cannot be opened. | |
| 189 Profile* GetStartupProfile(const base::FilePath& user_data_dir, | |
| 190 const base::CommandLine& command_line); | |
| 191 | |
| 192 // Returns the a fallback profile that should be loaded on process startup. | |
|
Peter Kasting
2016/07/01 00:53:24
Nit: extra a
Explain what a fallback profile is.
WC Leung
2016/07/07 17:01:54
Done.
| |
| 193 // Possible to return null, which means no profile (including user manager) can | |
|
Peter Kasting
2016/07/01 00:53:24
The user manager isn't a profile, so this sentence
WC Leung
2016/07/07 17:01:54
Revised the comment. PTAL.
| |
| 194 // be opened. | |
| 195 Profile* GetFallbackStartupProfile(); | |
| 196 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| 197 | |
| 182 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 198 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| OLD | NEW |