chrome/browser/browser_init.cc - Issue 2866034: Refactor shutdown code to allow win/linux to run after last browser closes.

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/browser_init.cc

Issue 2866034: Refactor shutdown code to allow win/linux to run after last browser closes. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Uploaded patch that resolves merge issue Created 10 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/browser_init.cc

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

index 97a7743c072a8f4c9f330b84b547eaca7b06d167..e9c2087b6cfa87c3b542555fc6bf823c3517b0d0 100644

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

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

@@ -460,7 +460,8 @@ bool BrowserInit::LaunchBrowser(

}

#endif

- if (command_line.HasSwitch(switches::kRestoreBackgroundContents)) {

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

+ command_line.HasSwitch(switches::kKeepAliveForTest)) {

// Create status icons

StatusTrayManager* tray = g_browser_process->status_tray_manager();

if (tray)

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