Stop using nested message loop for alert() and other JS dialogs

chrome/browser/ui/browser_tab_strip_model_delegate.cc

 // 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.
 
 #include "chrome/browser/ui/browser_tab_strip_model_delegate.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 108 matching lines @@
   // We only create historical tab entries for tabbed browser windows.
   if (service && browser_->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
     service->CreateHistoricalTab(
         sessions::ContentLiveTab::GetForWebContents(contents),
         browser_->tab_strip_model()->GetIndexOfWebContents(contents));
   }
 }
 
 bool BrowserTabStripModelDelegate::RunUnloadListenerBeforeClosing(
     content::WebContents* contents) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableFastUnload)) {
-    return chrome::FastUnloadController::RunUnloadEventsHelper(contents);
-  }
-  return chrome::UnloadController::RunUnloadEventsHelper(contents);
+  return browser_->RunUnloadListenerBeforeClosing(contents);
 }
 
 bool BrowserTabStripModelDelegate::ShouldRunUnloadListenerBeforeClosing(
     content::WebContents* contents) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableFastUnload)) {
-    return chrome::FastUnloadController::ShouldRunUnloadEventsHelper(contents);
-  }
-  return chrome::UnloadController::ShouldRunUnloadEventsHelper(contents);
+  return browser_->ShouldRunUnloadListenerBeforeClosing(contents);
 }
 
 bool BrowserTabStripModelDelegate::CanBookmarkAllTabs() const {
   return chrome::CanBookmarkAllTabs(browser_);
 }
 
 void BrowserTabStripModelDelegate::BookmarkAllTabs() {
   chrome::BookmarkAllTabs(browser_);
 }
 
 TabStripModelDelegate::RestoreTabType
 BrowserTabStripModelDelegate::GetRestoreTabType() {
   return chrome::GetRestoreTabType(browser_);
 }
 
 void BrowserTabStripModelDelegate::RestoreTab() {
   chrome::RestoreTab(browser_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripModelDelegate, private:
 
 void BrowserTabStripModelDelegate::CloseFrame() {
   browser_->window()->Close();
 }
 
 }  // namespace chrome