Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3647)

Unified Diff: chrome/browser/lifetime/browser_close_manager.cc

Issue 2681203002: Add Browser::SkipCallBeforeUnload so that the browser windows can be closed regardless of beforeunl… (Closed)
Patch Set: cr - remove delegate in UnloadController Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d8a943c1ab55a4172d9b0c66e9a8de2909183c1c 100644
--- a/chrome/browser/lifetime/browser_close_manager.cc
+++ b/chrome/browser/lifetime/browser_close_manager.cc
@@ -61,9 +61,8 @@ void BrowserCloseManager::StartClosingBrowsers() {
void BrowserCloseManager::CancelBrowserClose() {
browser_shutdown::SetTryingToQuit(false);
- for (auto* browser : *BrowserList::GetInstance()) {
- browser->ResetBeforeUnloadHandlers();
- }
+ for (auto* browser : *BrowserList::GetInstance())
+ browser->ResetTryToCloseWindow();
}
void BrowserCloseManager::TryToCloseBrowsers() {
@@ -73,7 +72,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;
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698