diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 21:30:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 21:30:42 +0000 |
| commit | 5c00ca86b708b403eef2a9ee616286b3aa91afb1 (patch) | |
| tree | c28669570ae2e6db2bbcc3496926e1c33f241bb7 /chrome/browser/browser_main.cc | |
| parent | 94b3935dc10b4df5e017697fcad97d127fe03fcb (diff) | |
| download | chromium_src-5c00ca86b708b403eef2a9ee616286b3aa91afb1.zip chromium_src-5c00ca86b708b403eef2a9ee616286b3aa91afb1.tar.gz chromium_src-5c00ca86b708b403eef2a9ee616286b3aa91afb1.tar.bz2 | |
Changes browser_tests to not run a nested message loop.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1513014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 25df1a8..fae898f 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1129,8 +1129,15 @@ int BrowserMain(const MainFunctionParams& parameters) { // We are in test mode. Run one task and enter the main message loop. if (pool) pool->Recycle(); + // TODO(sky): revisit once Trung fixs mac exiting, mac should be just like + // windows/linux. +#if defined(OS_MACOSX) MessageLoopForUI::current()->PostTask(FROM_HERE, parameters.ui_task); RunUIMessageLoop(browser_process.get()); +#else + parameters.ui_task->Run(); + delete parameters.ui_task; +#endif } else { // We are in regular browser boot sequence. Open initial stabs and enter // the main message loop. |