Fold AppModalDialog into its only subclass, JavaScriptAppModalDialog.

components/app_modal/javascript_dialog_manager.cc

 // Copyright 2014 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/app_modal/javascript_dialog_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/app_modal/app_modal_dialog.h"
 #include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/app_modal/javascript_dialog_extensions_client.h"
 #include "components/app_modal/javascript_native_dialog_factory.h"
 #include "components/app_modal/native_app_modal_dialog.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/javascript_dialog_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font_list.h"
@@ skipping 211 matching lines @@
       base::Bind(&JavaScriptDialogManager::OnBeforeUnloadDialogClosed,
                  base::Unretained(this), web_contents, callback)));
 }
 
 bool JavaScriptDialogManager::HandleJavaScriptDialog(
     content::WebContents* web_contents,
     bool accept,
     const base::string16* prompt_override) {
   AppModalDialogQueue* dialog_queue = AppModalDialogQueue::GetInstance();
   if (!dialog_queue->HasActiveDialog() ||
-      !dialog_queue->active_dialog()->IsJavaScriptModalDialog() ||
       dialog_queue->active_dialog()->web_contents() != web_contents) {
     return false;
   }
 
   JavaScriptAppModalDialog* dialog = static_cast<JavaScriptAppModalDialog*>(
       dialog_queue->active_dialog());
 
   if (dialog->javascript_dialog_type() ==
       content::JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT) {
     // Alert dialogs only have one button: OK. Any "handling" of this dialog has
     // to be a click on the OK button.
     accept = true;
   }
 
   if (accept) {
     if (prompt_override)
       dialog->SetOverridePromptText(*prompt_override);
     dialog->native_dialog()->AcceptAppModalDialog();
   } else {
     dialog->native_dialog()->CancelAppModalDialog();
   }
   return true;
 }
 
 void JavaScriptDialogManager::CancelDialogs(content::WebContents* web_contents,
                                             bool reset_state) {
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
-  AppModalDialog* active_dialog = queue->active_dialog();
-  for (AppModalDialogQueue::iterator i = queue->begin();
-       i != queue->end(); ++i) {
+  JavaScriptAppModalDialog* active_dialog = queue->active_dialog();
+  for (auto* dialog : *queue) {
     // Invalidating the active dialog might trigger showing a not-yet
     // invalidated dialog, so invalidate the active dialog last.
-    if ((*i) == active_dialog)
+    if (dialog == active_dialog)
       continue;
-    if ((*i)->web_contents() == web_contents)
-      (*i)->Invalidate();
+    if (dialog->web_contents() == web_contents)
+      dialog->Invalidate();
   }
   if (active_dialog && active_dialog->web_contents() == web_contents)
     active_dialog->Invalidate();
 
   if (reset_state)
     javascript_dialog_extra_data_.erase(web_contents);
 }
 
 void JavaScriptDialogManager::OnBeforeUnloadDialogClosed(
     content::WebContents* web_contents,
@@ skipping 22 matching lines @@
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   last_close_time_ = base::TimeTicks::Now();
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal