chrome/browser/automation/automation_provider.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/automation/automation_provider.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/automation/automation_provider.cc

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc

index bd3fac189ad9a2446cb972e909a2a3b7dedb1ab1..14600417f8980f93228ffb5da5118c033ea8e840 100644

--- a/chrome/browser/automation/automation_provider.cc

+++ b/chrome/browser/automation/automation_provider.cc

@@ -83,6 +83,7 @@

#include "chrome/common/automation_constants.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/json_value_serializer.h"

#include "chrome/common/net/url_request_context_getter.h"

@@ -3341,7 +3342,8 @@ void TestingAutomationProvider::OnBrowserRemoving(const Browser* browser) {

// For backwards compatibility with the testing automation interface, we

// want the automation provider (and hence the process) to go away when the

// last browser goes away.

- if (BrowserList::size() == 1) {

+ if (BrowserList::size() == 1 && !CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kKeepAliveForTest)) {

// If you change this, update Observer for NotificationType::SESSION_END

// below.

MessageLoop::current()->PostTask(FROM_HERE,

« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/background_contents_service.h » ('j') | no next file with comments »