Remove the unused close_on_interstitial_webui setting.

components/web_modal/web_contents_modal_dialog_manager.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 "components/web_modal/web_contents_modal_dialog_manager.h"
 
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 45 matching lines @@
 
 bool WebContentsModalDialogManager::IsDialogActive() const {
   return !child_dialogs_.empty();
 }
 
 void WebContentsModalDialogManager::FocusTopmostDialog() {
   DCHECK(!child_dialogs_.empty());
   child_dialogs_.front()->manager->Focus();
 }
 
-void WebContentsModalDialogManager::SetCloseOnInterstitialPage(
-    NativeWebContentsModalDialog dialog,
-    bool close) {
-  WebContentsModalDialogList::iterator loc = FindDialogState(dialog);
-  DCHECK(loc != child_dialogs_.end());
-  (*loc)->close_on_interstitial_webui = close;
-}
-
 content::WebContents* WebContentsModalDialogManager::GetWebContents() const {
   return web_contents();
 }
 
 void WebContentsModalDialogManager::WillClose(
     NativeWebContentsModalDialog dialog) {
   WebContentsModalDialogList::iterator dlg = FindDialogState(dialog);
 
   // The Views tab contents modal dialog calls WillClose twice.  Ignore the
   // second invocation.
@@ skipping 15 matching lines @@
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       delegate_(NULL),
       closing_all_dialogs_(false) {
 }
 
 WebContentsModalDialogManager::DialogState::DialogState(
     NativeWebContentsModalDialog dialog,
     scoped_ptr<SingleWebContentsDialogManager> mgr)
     : dialog(dialog),
-      manager(mgr.release()),
-#if defined(USE_AURA)
-      close_on_interstitial_webui(true)
-#else
-      // TODO(wittman): Test that closing on interstitial webui works properly
-      // on Mac and use the true default for all platforms.
-      close_on_interstitial_webui(false)
-#endif
-                                         {
+      manager(mgr.release()) {
 }
 
 WebContentsModalDialogManager::DialogState::~DialogState() {}
 
 WebContentsModalDialogManager::WebContentsModalDialogList::iterator
     WebContentsModalDialogManager::FindDialogState(
         NativeWebContentsModalDialog dialog) {
   WebContentsModalDialogList::iterator i;
   for (i = child_dialogs_.begin(); i != child_dialogs_.end(); ++i) {
     if ((*i)->dialog == dialog)
@@ skipping 61 matching lines @@
 
 void WebContentsModalDialogManager::WebContentsDestroyed() {
   // First cleanly close all child dialogs.
   // TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
   // some of these to close.  CloseAllDialogs is async, so it might get called
   // twice before it runs.
   CloseAllDialogs();
 }
 
 void WebContentsModalDialogManager::DidAttachInterstitialPage() {
-  // Copy the dialogs so we can close and remove them while iterating over the
-  // list.
-  WebContentsModalDialogList dialogs(child_dialogs_);
-  for (WebContentsModalDialogList::iterator it = dialogs.begin();
-       it != dialogs.end(); ++it) {
-    if ((*it)->close_on_interstitial_webui)
-      (*it)->manager->Close();
-  }
+  // TODO(wittman): Test closing on interstitial webui works properly on Mac.
+#if defined(USE_AURA)
+  CloseAllDialogs();
+#endif
 }
 
 }  // namespace web_modal