summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorsanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 21:47:17 +0000
committersanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 21:47:17 +0000
commited453c0a1d45f244d9b675c59bad604029cb1281 (patch)
tree69788c4d6f709254cd5e061f7f84c81d30d9e6fe /chrome/browser/browser_main.cc
parent3eb923c081d9e23654f6f618b0ba553fb7f2bcfa (diff)
downloadchromium_src-ed453c0a1d45f244d9b675c59bad604029cb1281.zip
chromium_src-ed453c0a1d45f244d9b675c59bad604029cb1281.tar.gz
chromium_src-ed453c0a1d45f244d9b675c59bad604029cb1281.tar.bz2
Fixed ServiceProcessControl::Launch to remember the Task supplied to it in a list so that multiple successive Launch calls will work. Also added separate success and failure tasks to Launch. Modified the browser test to test this new functionality. Modified callers.
BUG=58802 TEST=Browser tests, Cloud Print Proxy UI. Review URL: http://codereview.chromium.org/3851001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index f21b2e2..76c94fd 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1451,7 +1451,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) {
ServiceProcessControl* control = ServiceProcessControlManager::instance()
->GetProcessControl(profile);
- control->Launch(NULL);
+ control->Launch(NULL, NULL);
}
}