Simplify the JavaScriptDialogManager.

components/app_modal/javascript_app_modal_dialog.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/app_modal/javascript_app_modal_dialog.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/app_modal/javascript_dialog_manager.h"
@@ skipping 74 matching lines @@
 NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {
   return JavaScriptDialogManager::GetInstance()
       ->native_dialog_factory()
       ->CreateNativeJavaScriptDialog(this);
 }
 
 bool JavaScriptAppModalDialog::IsJavaScriptModalDialog() {
   return true;
 }
 
-void JavaScriptAppModalDialog::Invalidate() {
+void JavaScriptAppModalDialog::Invalidate(bool suppress_callbacks) {
   if (!IsValid())
     return;
 
-  AppModalDialog::Invalidate();
-  CallDialogClosedCallback(false, base::string16());
+  AppModalDialog::Invalidate(suppress_callbacks);
+  if (!suppress_callbacks)
+    CallDialogClosedCallback(false, base::string16());
   if (native_dialog())
     CloseModalDialog();
 }
 
 void JavaScriptAppModalDialog::OnCancel(bool suppress_js_messages) {
   // We need to do this before WM_DESTROY (WindowClosing()) as any parent frame
   // will receive its activation messages before this dialog receives
   // WM_DESTROY. The parent frame would then try to activate any modal dialogs
   // that were still open in the ModalDialogQueue, which would send activation
   // back to this one. The framework should be improved to handle this, so this
@@ skipping 36 matching lines @@
   // data from the map owned by ::JavaScriptDialogManager. Make sure
   // to only use the data if still present. http://crbug.com/236476
   ExtraDataMap::iterator extra_data = extra_data_map_->find(web_contents());
   if (extra_data != extra_data_map_->end()) {
     extra_data->second.has_already_shown_a_dialog_ = true;
     extra_data->second.suppress_javascript_messages_ = suppress_js_messages;
   }
 
   // On Views, we can end up coming through this code path twice :(.
   // See crbug.com/63732.
-  AppModalDialog::Invalidate();
+  AppModalDialog::Invalidate(false);
 }
 
 void JavaScriptAppModalDialog::CallDialogClosedCallback(bool success,
     const base::string16& user_input) {
   // TODO(joenotcharles): Both the callers of this function also check IsValid
   // and call AppModalDialog::Invalidate, but in different orders. If the
   // difference is not significant, more common code could be moved here.
   UMA_HISTOGRAM_MEDIUM_TIMES(
       "JSDialogs.FineTiming.TimeBetweenDialogCreatedAndSameDialogClosed",
       base::TimeTicks::Now() - creation_time_);
   if (!callback_.is_null()) {
     callback_.Run(success, user_input);
     callback_.Reset();
   }
 }
 
 }  // namespace app_modal