Index: components/app_modal/javascript_dialog_manager.cc |
diff --git a/components/app_modal/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc |
index c5a368384b597f56c031f3c1ad1c6b89f659e268..de3674c309b7e049b240b9142295f48f29bc1444 100644 |
--- a/components/app_modal/javascript_dialog_manager.cc |
+++ b/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(); |