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

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: Respond to comments, copy base/test/* from CL 2061593002 again. Created 4 years, 5 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..932140afc922c07daa7a967c46af5803318baa02 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.h
+++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -179,4 +179,21 @@ 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 returned by GetStartupProfilePath, or the guest profile if the
+// above profile is locked. The guest profile denotes that we should open the
+// user manager. Returns null if the above profile cannot be opened. In case of
+// user manager, returns null if either the guest profile or the system profile
Peter Kasting 2016/07/19 21:56:07 Nit: user -> opening the user
WC Leung 2016/07/27 18:00:06 Done.
+// cannot be opened.
+Profile* GetStartupProfile(const base::FilePath& user_data_dir,
+ const base::CommandLine& command_line);
+
+// Returns the profile that should be loaded on process startup when
+// GetStartupProfile() returns null. As with GetStartupProfile(), returning the
+// guest profile means the caller should open the user manager. This may return
+// null if no profile nor the user manager can be opened.
Peter Kasting 2016/07/19 21:56:07 Nit: no profile nor the user manager -> neither th
WC Leung 2016/07/27 18:00:06 Done.
+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