Revert 212329 "Reland "Close web contents modal dialogs on conte..."

trunk/src/components/web_modal/web_contents_modal_dialog_manager.h

Index: trunk/src/components/web_modal/web_contents_modal_dialog_manager.h
===================================================================
--- trunk/src/components/web_modal/web_contents_modal_dialog_manager.h	(revision 214772)
+++ trunk/src/components/web_modal/web_contents_modal_dialog_manager.h	(working copy)
@@ -45,11 +45,6 @@
   // calling this function.
   void FocusTopmostDialog();
 
-  // Set to true to prevent closing the window when a page load starts on the
-  // WebContents.
-  void SetPreventCloseOnLoadStart(NativeWebContentsModalDialog dialog,
-                                  bool prevent);
-
   // Overriden from NativeWebContentsModalDialogManagerDelegate:
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   // Called when a WebContentsModalDialogs we own is about to be closed.
@@ -81,19 +76,8 @@
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
 
-  struct DialogState {
-    explicit DialogState(NativeWebContentsModalDialog dialog);
+  typedef std::deque<NativeWebContentsModalDialog> WebContentsModalDialogList;
 
-    NativeWebContentsModalDialog dialog;
-    bool prevent_close_on_load_start;
-  };
-
-  typedef std::deque<DialogState> WebContentsModalDialogList;
-
-  // Utility function to get the dialog state for a dialog.
-  WebContentsModalDialogList::iterator FindDialogState(
-      NativeWebContentsModalDialog dialog);
-
   // Blocks/unblocks interaction with renderer process.
   void BlockWebContentsInteraction(bool blocked);
 
@@ -103,6 +87,9 @@
   void CloseAllDialogs();
 
   // Overridden from content::WebContentsObserver:
+  virtual void DidNavigateMainFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) OVERRIDE;
   virtual void DidGetIgnoredUIEvent() OVERRIDE;
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;