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

chrome/browser/ui/browser.cc

 // Copyright 2012 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/ui/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 638 matching lines @@
     current_index = match_index;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, OnBeforeUnload handling:
 
 bool Browser::ShouldCloseWindow() {
   if (!CanCloseWithInProgressDownloads())
     return false;
-
   if (IsFastTabUnloadEnabled())
     return fast_unload_controller_->ShouldCloseWindow();
   return unload_controller_->ShouldCloseWindow();
 }
 
-bool Browser::CallBeforeUnloadHandlers(
+bool Browser::TryToCloseWindow(
+    bool skip_beforeunload,
     const base::Callback<void(bool)>& on_close_confirmed) {
   cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
   if (IsFastTabUnloadEnabled()) {
-    return fast_unload_controller_->CallBeforeUnloadHandlers(
-        on_close_confirmed);
+    return fast_unload_controller_->TryToCloseWindow(skip_beforeunload,
+                                                     on_close_confirmed);
   }
-  return unload_controller_->CallBeforeUnloadHandlers(on_close_confirmed);
+  return unload_controller_->TryToCloseWindow(skip_beforeunload,
+                                              on_close_confirmed);
 }
 
-void Browser::ResetBeforeUnloadHandlers() {
+void Browser::ResetTryToCloseWindow() {
   cancel_download_confirmation_state_ = NOT_PROMPTED;
   if (IsFastTabUnloadEnabled())
-    fast_unload_controller_->ResetBeforeUnloadHandlers();
+    fast_unload_controller_->ResetTryToCloseWindow();
   else
-    unload_controller_->ResetBeforeUnloadHandlers();
+    unload_controller_->ResetTryToCloseWindow();
 }
 
 bool Browser::HasCompletedUnloadProcessing() const {
   DCHECK(IsFastTabUnloadEnabled());
   return fast_unload_controller_->HasCompletedUnloadProcessing();
 }
 
 bool Browser::IsAttemptingToCloseBrowser() const {
   if (IsFastTabUnloadEnabled())
     return fast_unload_controller_->is_attempting_to_close_browser();
@@ skipping 1971 matching lines @@
     // new window later, thus we need to navigate the window now.
     if (contents) {
       contents->web_contents()->GetController().LoadURL(
           target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
           std::string());  // No extra headers.
     }
   }
 
   return contents != NULL;
 }