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

chrome/browser/ui/unload_controller.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_
 #define CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_
 
+#include <memory>
 #include <set>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 class TabStripModel;
+class UnloadControllerWebContentsDelegate;
 
 namespace content {
 class NotificationSource;
 class NotificationDetails;
 class WebContents;
 }
 
 namespace chrome {
 
 class UnloadController : public content::NotificationObserver,
@@ skipping 26 matching lines @@
 
   bool is_attempting_to_close_browser() const {
     return is_attempting_to_close_browser_;
   }
 
   // Called in response to a request to close |browser_|'s window. Returns true
   // when there are no remaining beforeunload handlers to be run.
   bool ShouldCloseWindow();
 
   // Begins the process of confirming whether the associated browser can be
-  // closed.
-  bool CallBeforeUnloadHandlers(
-      const base::Callback<void(bool)>& on_close_confirmed);
+  // closed. Beforeunload events won't be fired if |skip_beforeunload|
+  // is true.
+  bool TryToCloseWindow(bool skip_beforeunload,
+                        const base::Callback<void(bool)>& on_close_confirmed);
 
   // Clears the results of any beforeunload confirmation dialogs triggered by a
-  // CallBeforeUnloadHandlers call.
-  void ResetBeforeUnloadHandlers();
+  // TryToCloseWindow call.
+  void ResetTryToCloseWindow();
 
   // Returns true if |browser_| has any tabs that have BeforeUnload handlers
   // that have not been fired. This method is non-const because it builds a list
   // of tabs that need their BeforeUnloadHandlers fired.
   // TODO(beng): This seems like it could be private but it is used by
   //             AreAllBrowsersCloseable() in application_lifetime.cc. It seems
   //             very similar to ShouldCloseWindow() and some consolidation
   //             could be pursued.
   bool TabsNeedBeforeUnloadFired();
 
@@ skipping 18 matching lines @@
   void TabReplacedAt(TabStripModel* tab_strip_model,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
   void TabStripEmpty() override;
 
   void TabAttachedImpl(content::WebContents* contents);
   void TabDetachedImpl(content::WebContents* contents);
 
   // Processes the next tab that needs it's beforeunload/unload event fired.
-  void ProcessPendingTabs();
+  void ProcessPendingTabs(bool skip_beforeunload);
 
   // Whether we've completed firing all the tabs' beforeunload/unload events.
   bool HasCompletedUnloadProcessing() const;
 
   // Removes |web_contents| from the passed |set|.
   // Returns whether the tab was in the set in the first place.
   bool RemoveFromSet(UnloadListenerSet* set,
                      content::WebContents* web_contents);
 
   // Cleans up state appropriately when we are trying to close the browser and
@@ skipping 27 matching lines @@
   // in preparation for closing the browser. UnloadController owns this state
   // rather than Browser because unload handlers are the only reason that a
   // Browser window isn't just immediately closed.
   bool is_attempting_to_close_browser_;
 
   // A callback to call to report whether the user chose to close all tabs of
   // |browser_| that have beforeunload event handlers. This is set only if we
   // are currently confirming that the browser is closable.
   base::Callback<void(bool)> on_close_confirmed_;
 
+  // Manage tabs with beforeunload/unload handlers when beforeunload events are
+  // bypassed.
+  std::unique_ptr<UnloadControllerWebContentsDelegate> web_contents_delegate_;
+
   base::WeakPtrFactory<UnloadController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnloadController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_