| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 7aa35da44a634db564ac5d9a95e6fc081c400392..6d7e020f0d8c9698026a14e5f331f451e14089d5 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -832,6 +832,13 @@ void Browser::UpdateDownloadShelfVisibility(bool visible) {
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| // static
|
| +bool Browser::CanFastShutdownWebContents(content::WebContents* contents) {
|
| + if (IsFastTabUnloadEnabled())
|
| + return chrome::FastUnloadController::CanFastShutdownWebContents(contents);
|
| + return chrome::UnloadController::CanFastShutdownWebContents(contents);
|
| +}
|
| +
|
| +// static
|
| bool Browser::RunUnloadEventsHelper(WebContents* contents) {
|
| if (IsFastTabUnloadEnabled())
|
| return chrome::FastUnloadController::RunUnloadEventsHelper(contents);
|
| @@ -1430,6 +1437,10 @@ gfx::Rect Browser::GetRootWindowResizerRect() const {
|
| void Browser::BeforeUnloadFired(WebContents* web_contents,
|
| bool proceed,
|
| bool* proceed_to_fire_unload) {
|
| + if (is_devtools() && DevToolsWindow::HandleBeforeUnload(web_contents,
|
| + proceed, proceed_to_fire_unload))
|
| + return;
|
| +
|
| if (IsFastTabUnloadEnabled()) {
|
| *proceed_to_fire_unload =
|
| fast_unload_controller_->BeforeUnloadFired(web_contents, proceed);
|
|
|