chrome/browser/ui/browser_init.cc - Issue 8745015: Store the "browser autorestarted, last session must be restored" information in a preference.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 8745015: Store the "browser autorestarted, last session must be restored" information in a preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Build fix (browser_tests). Created 9 years 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/browser_init.cc

diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc

index b1dd2dbe7f4c90a213a8ffc5f0ef9c656792c901..87c15a1a7219f0eab773c6663bcbbc0b0deac488 100644

--- a/chrome/browser/ui/browser_init.cc

+++ b/chrome/browser/ui/browser_init.cc

@@ -332,9 +332,12 @@ bool IncognitoIsForced(const CommandLine& command_line,

SessionStartupPref GetSessionStartupPref(const CommandLine& command_line,

Profile* profile) {

+ PrefService* pref_service = g_browser_process->local_state();

SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);

- if (command_line.HasSwitch(switches::kRestoreLastSession))

+ if (command_line.HasSwitch(switches::kRestoreLastSession) ||

+ pref_service->GetBoolean(prefs::kWasRestarted)) {

pref.type = SessionStartupPref::LAST;

+ }

if (pref.type == SessionStartupPref::LAST &&

IncognitoIsForced(command_line, profile->GetPrefs())) {

// We don't store session information when incognito. If the user has

« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_list.h » ('j') | no next file with comments »