| Index: chrome/browser/lifetime/browser_close_manager.cc
|
| diff --git a/chrome/browser/lifetime/browser_close_manager.cc b/chrome/browser/lifetime/browser_close_manager.cc
|
| index 2a32c3c638fd84ecb4db5669acc6439924feea3b..2d121ce3bd415abb1cf6c17781f3a77e9b81e68a 100644
|
| --- a/chrome/browser/lifetime/browser_close_manager.cc
|
| +++ b/chrome/browser/lifetime/browser_close_manager.cc
|
| @@ -62,7 +62,7 @@ void BrowserCloseManager::StartClosingBrowsers() {
|
| void BrowserCloseManager::CancelBrowserClose() {
|
| browser_shutdown::SetTryingToQuit(false);
|
| for (auto* browser : *BrowserList::GetInstance()) {
|
| - browser->ResetBeforeUnloadHandlers();
|
| + browser->ResetCloseWindow();
|
| }
|
| }
|
|
|
| @@ -73,7 +73,8 @@ void BrowserCloseManager::TryToCloseBrowsers() {
|
| // OnBrowserReportCloseable with the result. If the user confirms the close,
|
| // this will trigger TryToCloseBrowsers to try again.
|
| for (auto* browser : *BrowserList::GetInstance()) {
|
| - if (browser->CallBeforeUnloadHandlers(
|
| + if (browser->TryToCloseWindow(
|
| + false,
|
| base::Bind(&BrowserCloseManager::OnBrowserReportCloseable, this))) {
|
| current_browser_ = browser;
|
| return;
|
|
|