Add Browser::SkipCallBeforeUnload so that the browser windows can be closed regardless of beforeunl…

chrome/browser/lifetime/browser_close_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/lifetime/browser_close_manager.h"
 
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
@@ skipping 43 matching lines @@
     // Tell everyone that we are shutting down.
     browser_shutdown::SetTryingToQuit(true);
     CloseBrowsers();
     return;
   }
   TryToCloseBrowsers();
 }
 
 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();
   }
 }
 
 void BrowserCloseManager::TryToCloseBrowsers() {
   // If all browser windows can immediately be closed, fall out of this loop and
   // close the browsers. If any browser window cannot be closed, temporarily
   // stop closing. CallBeforeUnloadHandlers prompts the user and calls
   // 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;
     }
   }
   CheckForDownloadsInProgress();
 }
 
 void BrowserCloseManager::OnBrowserReportCloseable(bool proceed) {
   if (!current_browser_)
@@ skipping 93 matching lines @@
       browser->window()->DestroyBrowser();
       // Destroying the browser should have removed it from the browser list.
       DCHECK(BrowserList::GetInstance()->end() ==
              std::find(BrowserList::GetInstance()->begin(),
                        BrowserList::GetInstance()->end(), browser));
     }
   }
 
   g_browser_process->notification_ui_manager()->CancelAll();
 }