diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 00:04:48 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 00:04:48 +0000 |
| commit | c0924e5c2f4ce109ad91ce39945a0e8c104246d7 (patch) | |
| tree | 66d59bafd16e2da7b8a860c045d8c245c2b2297d /content/shell/shell_browser_main.cc | |
| parent | 0d554028a501c5768438a411af8dfeefffc4dd79 (diff) | |
| download | chromium_src-c0924e5c2f4ce109ad91ce39945a0e8c104246d7.zip chromium_src-c0924e5c2f4ce109ad91ce39945a0e8c104246d7.tar.gz chromium_src-c0924e5c2f4ce109ad91ce39945a0e8c104246d7.tar.bz2 | |
Revert 189152
(Restore 189135, since it was not the cause of the test failures).
> Revert 189135 "[content shell] close the main window after check..."
>
> It broke mac bots (http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac10.7%20Tests%20%281%29&number=9697)
>
> > [content shell] close the main window after checking layout system deps
> >
> > BUG=none
> >
> > Review URL: https://codereview.chromium.org/12594007
>
> TBR=jochen@chromium.org
> Review URL: https://codereview.chromium.org/12871018
TBR=wjia@chromium.org
Review URL: https://codereview.chromium.org/12843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_browser_main.cc')
| -rw-r--r-- | content/shell/shell_browser_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 4b266d9..28a9431 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -17,6 +17,7 @@ #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "content/public/browser/browser_main_runner.h" +#include "content/shell/shell.h" #include "content/shell/shell_switches.h" #include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" @@ -117,6 +118,7 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { switches::kCheckLayoutTestSysDeps)) { MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); main_runner_->Run(); + content::Shell::CloseAllWindows(); main_runner_->Shutdown(); return 0; } |