Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index e321e5d1324a306c5c9797713672d6fe5851ba1f..687c03f0c91682619c3b8be6500d27b440e41e35 100644 |
| --- a/chrome/browser/ui/browser.h |
| +++ b/chrome/browser/ui/browser.h |
| @@ -317,25 +317,27 @@ class Browser : public TabStripModelObserver, |
| // 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. |
| + // return false. If |skip_before_unload_event| is true, all beforeunload |
|
Charlie Reis
2017/02/27 21:47:51
Please add a very clear disclaimer here that befor
zmin
2017/03/06 23:58:08
Done.
|
| + // handlers will be skipped and window closing will be confirmed without |
| + // showing the prompt, the function will return false as well. |
| + // 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 |
| // this function multiple times without an intervening call to |
| - // ResetBeforeUnloadHandlers() will run only the beforeunload handlers |
| + // ResetTryToCloseWindow() will run only the beforeunload handlers |
| // registered since the previous call. |
| - bool CallBeforeUnloadHandlers( |
| - const base::Callback<void(bool)>& on_close_confirmed); |
| + bool TryToCloseWindow(bool skip_before_unload_event, |
|
Charlie Reis
2017/02/27 21:47:51
You can probably simplify all of these to skip_bef
zmin
2017/03/06 23:58:08
Done.
|
| + 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(); |
| // Figure out if there are tabs that have beforeunload handlers. |
| // It starts beforeunload/unload processing as a side-effect. |