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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator.h

Issue 2047483003: Add fallback behavior if the last used profile cannot initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug-614753-fix
Patch Set: Refactored startup profile choosing code, reduced number of messages, bug fix (oops) Created 4 years, 6 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: chrome/browser/ui/startup/startup_browser_creator.h
diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h
index f2e3c0a5fd757609b5df07e3960161ba5350888d..6e00e0cf0dec6eda7c40847593039f34de0a1e8e 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.h
+++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -179,4 +179,18 @@ bool HasPendingUncleanExit(Profile* profile);
base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
const base::CommandLine& command_line);
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+// Returns the profile that should be loaded on process startup. This is either
+// the profile return by GetStartupProfilePath, or the guest profile (user
+// manager) if the above profile is signed out. Returns NULL if this profile
Peter Kasting 2016/06/16 06:37:49 Nit: null (2 places) What does "user manager" mea
WC Leung 2016/06/19 17:56:19 Done.
Peter Kasting 2016/06/20 02:25:50 Sorry, I wasn't sufficiently clear. I know what t
WC Leung 2016/06/20 15:44:24 Acknowledged.
WC Leung 2016/06/24 16:17:50 Done.
+// cannot be opened.
+Profile* GetStartupProfile(const base::FilePath& user_data_dir,
+ const base::CommandLine& command_line);
+
+// Returns the a fallback profile that should be loaded on process startup.
+// Possible to return NULL, which means no profile (including guest profile) can
+// be opened.
+Profile* GetFallbackStartupProfile();
+#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+
#endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_

Powered by Google App Engine
This is Rietveld 408576698