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

chrome/browser/ui/browser.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_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 299 matching lines @@
       bool include_app_name,
       content::WebContents* contents) const;
 
   // Prepares a title string for display (removes embedded newlines, etc).
   static void FormatTitleForDisplay(base::string16* title);
 
   // OnBeforeUnload handling //////////////////////////////////////////////////
 
   // Gives beforeunload handlers the chance to cancel the close. Returns whether
   // to proceed with the close. If called while the process begun by
-  // CallBeforeUnloadHandlers is in progress, returns false without taking
-  // action.
+  // TryToCloseWindow is in progress, returns false without taking action.
   bool ShouldCloseWindow();
 
   // Begins the process of confirming whether the associated browser can be
   // closed. If there are no tabs with beforeunload handlers it will immediately
   // return false. Otherwise, it starts prompting the user, returns true and
   // will call |on_close_confirmed| with the result of the user's decision.
   // After calling this function, if the window will not be closed, call
   // ResetBeforeUnloadHandlers() to reset all beforeunload handlers; calling

[sky, 2017/02/13 16:55:51]

Update comment.

   // this function multiple times without an intervening call to
-  // ResetBeforeUnloadHandlers() will run only the beforeunload handlers
+  // ResetCloseWindow() will run only the beforeunload handlers
   // registered since the previous call.
-  bool CallBeforeUnloadHandlers(
-      const base::Callback<void(bool)>& on_close_confirmed);
+  // If |skip_before_unload_event| is set to true, all prompting will be

[sky, 2017/02/13 16:55:51]

I'm confused by the behavior of skip_before_unload_event. Can't this function
return false if skip_before_unload_event is true?

+  // skipped as user confirm the dialog. |on_close_confirmed| will always
+  // be called.
+  bool TryToCloseWindow(bool skip_before_unload_event,
+                        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 ResetCloseWindow();

[sky, 2017/02/13 16:55:51]

It isn't obvious from this name it ties with TryToCloseWindow. Could you name it
ResetAttemptToCloseWindow? Or ResetTryToCloseWindow?

 
   // Figure out if there are tabs that have beforeunload handlers.
   // It starts beforeunload/unload processing as a side-effect.
   bool TabsNeedBeforeUnloadFired();
 
   // Returns true if all tabs' beforeunload/unload events have fired.
   bool HasCompletedUnloadProcessing() const;
 
   bool IsAttemptingToCloseBrowser() const;
 
@@ skipping 668 matching lines @@
   // The following factory is used for chrome update coalescing.
   base::WeakPtrFactory<Browser> chrome_updater_factory_;
 
   // The following factory is used to close the frame at a later time.
   base::WeakPtrFactory<Browser> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_