diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 05:38:44 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 05:38:44 +0000 |
| commit | 304a317201cf92f40c6ba7c9e969939c69205b2e (patch) | |
| tree | 6c6fb617343a9da85e34517815eda0cca0281f34 /chrome/browser/browser_main.cc | |
| parent | 2064d539a923c24ac6bae72ed6f9481421317fd3 (diff) | |
| download | chromium_src-304a317201cf92f40c6ba7c9e969939c69205b2e.zip chromium_src-304a317201cf92f40c6ba7c9e969939c69205b2e.tar.gz chromium_src-304a317201cf92f40c6ba7c9e969939c69205b2e.tar.bz2 | |
Mac: Don't run nested loop for browser_tests (matching Windows and Linux).
See sky's commit at r44412.
Also fix loading of MainMenu.nib when running browser_tests. (These two fixes are mutually dependent.)
BUG=43148
TEST=browser_tests still pass (or pass even more)
Review URL: http://codereview.chromium.org/1689001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46331 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, 0 insertions, 7 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 179201d..b2b4489 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1176,15 +1176,8 @@ 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. |