diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 21:51:39 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 21:51:39 +0000 |
commit | 41741a96ce6b7b3cfca3d59ef3bb59064dc939e0 (patch) | |
tree | 04691674fee10a438145d1bc42325c9ea00d2f7a /chrome/browser/app_controller_mac.mm | |
parent | 4daf03583a367047c06cbc05aace8f9edc355237 (diff) | |
download | chromium_src-41741a96ce6b7b3cfca3d59ef3bb59064dc939e0.zip chromium_src-41741a96ce6b7b3cfca3d59ef3bb59064dc939e0.tar.gz chromium_src-41741a96ce6b7b3cfca3d59ef3bb59064dc939e0.tar.bz2 |
Fix window close and application quit on Mac to call the proper Browser machinery in the proper order. Add comments to BrowserWindow::Close to stress its assumptions. DCHECK that nobody adds a NULL browser to the browser list.
Review URL: http://codereview.chromium.org/20460
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r-- | chrome/browser/app_controller_mac.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 5a9609a..d7b0a72 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -8,6 +8,7 @@ #import "chrome/app/chrome_dll_resource.h" #import "chrome/browser/browser.h" #import "chrome/browser/browser_list.h" +#include "chrome/browser/browser_shutdown.h" #import "chrome/browser/command_updater.h" #import "chrome/browser/profile_manager.h" #import "chrome/common/temp_scaffolding_stubs.h" @@ -48,6 +49,12 @@ // handle it. If it says to continue, post the quit message, otherwise // go back to normal. + // TODO(pinkerton): Not sure where this should live, including it here + // causes all sorts of asserts from the open renderers. On Windows, it + // lives in Browser::OnWindowClosing, but that's not appropriate on Mac + // since we don't shut down when we reach zero windows. + // browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE); + // Close all the windows. BrowserList::CloseAllBrowsers(true); |