Close web contents modal dialogs on content load start

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/notification_details.h"
@@ skipping 56 matching lines @@
       !closing_all_dialogs_)
     native_manager_->ShowDialog(child_dialogs_.front());
 
   BlockWebContentsInteraction(!child_dialogs_.empty());
 }
 
 void WebContentsModalDialogManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED);
+  if (type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) {
+    if (child_dialogs_.empty())
+      return;
 
-  if (child_dialogs_.empty())
-    return;
-
-  bool visible = *content::Details<bool>(details).ptr();
-  if (visible)
-    native_manager_->ShowDialog(child_dialogs_.front());
-  else
-    native_manager_->HideDialog(child_dialogs_.front());
+    bool visible = *content::Details<bool>(details).ptr();
+    if (visible)
+      native_manager_->ShowDialog(child_dialogs_.front());
+    else
+      native_manager_->HideDialog(child_dialogs_.front());
+  } else if (type == content::NOTIFICATION_LOAD_START) {
+    if (!child_dialogs_.empty())
+      native_manager_->CloseDialog(child_dialogs_.front());
+  }
 }
 
 WebContentsModalDialogManager::WebContentsModalDialogManager(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       delegate_(NULL),
       native_manager_(CreateNativeManager(this)),
       closing_all_dialogs_(false) {
   DCHECK(native_manager_);
+  content::NavigationController* controller =
+      &GetWebContents()->GetController();
+  registrar_.Add(this,
+                 content::NOTIFICATION_LOAD_START,
+                 content::Source<content::NavigationController>(controller));
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                  content::Source<content::WebContents>(web_contents));
 }
 
 void WebContentsModalDialogManager::BlockWebContentsInteraction(bool blocked) {
   WebContents* contents = web_contents();
   if (!contents) {
     // The WebContents has already disconnected.
     return;
@@ skipping 10 matching lines @@
 void WebContentsModalDialogManager::CloseAllDialogs() {
   closing_all_dialogs_ = true;
 
   // Clear out any dialogs since we are leaving this page entirely.
   while (!child_dialogs_.empty())
     native_manager_->CloseDialog(child_dialogs_.front());
 
   closing_all_dialogs_ = false;
 }
 
-void WebContentsModalDialogManager::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
-  // Close constrained windows if necessary.
-  if (!net::registry_controlled_domains::SameDomainOrHost(
-          details.previous_url, details.entry->GetURL(),
-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES))
-    CloseAllDialogs();
-}
-
 void WebContentsModalDialogManager::DidGetIgnoredUIEvent() {
   if (!child_dialogs_.empty())
     native_manager_->FocusDialog(child_dialogs_.front());
 }
 
 void WebContentsModalDialogManager::WebContentsDestroyed(WebContents* tab) {
   // 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();
 }
 
 }  // namespace web_modal