1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/components/app_modal/javascript_dialog_manager.cc b/chromium/components/app_modal/javascript_dialog_manager.cc
index c5a368384b5..de3674c309b 100644
--- a/chromium/components/app_modal/javascript_dialog_manager.cc
+++ b/chromium/components/app_modal/javascript_dialog_manager.cc
@@ -12,7 +12,6 @@
 #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"
@@ -244,7 +243,6 @@ bool JavaScriptDialogManager::HandleJavaScriptDialog(
     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;
   }
@@ -272,15 +270,14 @@ bool JavaScriptDialogManager::HandleJavaScriptDialog(
 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();