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..fa3043665d865ad964d6628093dfb54c782b7ba3 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()) { |
sky
2017/03/14 00:04:05
no {}
zmin
2017/03/14 17:46:47
Done.
|
- browser->ResetBeforeUnloadHandlers(); |
+ browser->ResetTryToCloseWindow(); |
} |
} |
@@ -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; |