Index: chrome/browser/ui/browser.cc |
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
index 059efd26b506f7cdef195a44c7245636f0498256..c4bbed985482ed3661b7463108c974f7cbd14b77 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); |