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

trunk/src/components/web_modal/web_contents_modal_dialog_manager.h

 // 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.
 
 #ifndef COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 #define COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
   // WillClose() when it is being destroyed.
   void ShowDialog(NativeWebContentsModalDialog dialog);
 
   // Returns true if a dialog is currently being shown.
   bool IsShowingDialog() const;
 
   // Focus the topmost modal dialog.  IsShowingDialog() must be true when
   // 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.
   virtual void WillClose(NativeWebContentsModalDialog dialog) OVERRIDE;
 
   // content::NotificationObserver overrides
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
@@ skipping 11 matching lines @@
    private:
     WebContentsModalDialogManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
  private:
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
 
-  struct DialogState {
-    explicit DialogState(NativeWebContentsModalDialog dialog);
-
-    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);
+  typedef std::deque<NativeWebContentsModalDialog> WebContentsModalDialogList;
 
   // Blocks/unblocks interaction with renderer process.
   void BlockWebContentsInteraction(bool blocked);
 
   bool IsWebContentsVisible() const;
 
   // Closes all WebContentsModalDialogs.
   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;
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   WebContentsModalDialogManagerDelegate* delegate_;
 
   // Delegate for native UI-specific functions on the dialog.
   scoped_ptr<NativeWebContentsModalDialogManager> native_manager_;
 
   // All active dialogs.
   WebContentsModalDialogList child_dialogs_;
 
   // True while closing the dialogs on WebContents close.
   bool closing_all_dialogs_;
 
   // A scoped container for notification registries.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogManager);
 };
 
 }  // namespace web_modal
 
 #endif  // COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_