Close web contents modal dialogs on content load start

chrome/browser/printing/print_preview_dialog_controller.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 CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
@@ skipping 58 matching lines @@
   // Erase the initiator tab info associated with |preview_tab|.
   void EraseInitiatorTabInfo(content::WebContents* preview_tab);
 
   bool is_creating_print_preview_dialog() const {
     return is_creating_print_preview_dialog_;
   }
 
  private:
   friend class base::RefCounted<PrintPreviewDialogController>;
 
+  // Used to distinguish between the two varieties of WebContents dealt with by
+  // this class.
+  enum TabType {

[Lei Zhang, 2013/06/27 21:36:18]

nit: the preview is not actually a tab, so PREVIEW_DIALOG instead of PREVIEW_TAB
and ContentType instead of TabType?

[Mike Wittman, 2013/06/27 23:39:38]

Done.

With the web contents modal dialog work, the initiator also doesn't have to
correspond to a WebContents in a tab.  I've added another patchset with a mass
change of terminology from "initiator tab" to just "initiator." We can keep that
or kill it.

+    INITIATOR_TAB,
+    PREVIEW_TAB
+  };
+
   // 1:1 relationship between a print preview dialog and its initiator tab.
   // Key: Print preview dialog.
   // Value: Initiator tab.
   typedef std::map<content::WebContents*, content::WebContents*>
       PrintPreviewDialogMap;
 
   virtual ~PrintPreviewDialogController();
 
   // Handler for the RENDERER_PROCESS_CLOSED notification. This is observed when
   // the initiator renderer crashed.
@@ skipping 10 matching lines @@
 
   // Creates a new print preview dialog.
   content::WebContents* CreatePrintPreviewDialog(
       content::WebContents* initiator_tab);
 
   // Helper function to store the title of the initiator tab associated with
   // |preview_dialog| in |preview_dialog|'s PrintPreviewUI.
   void SaveInitiatorTabTitle(content::WebContents* preview_dialog);
 
   // Adds/Removes observers for notifications from |contents|.
-  void AddObservers(content::WebContents* contents);
-  void RemoveObservers(content::WebContents* contents);
+  void AddObservers(content::WebContents* contents, TabType tab_type);
+  void RemoveObservers(content::WebContents* contents, TabType tab_type);
 
   // Removes WebContents when they close/crash/navigate.
   void RemoveInitiatorTab(content::WebContents* initiator_tab);
   void RemovePreviewDialog(content::WebContents* preview_dialog);
 
   // Mapping between print preview dialog and the corresponding initiator tab.
   PrintPreviewDialogMap preview_dialog_map_;
 
   // A registrar for listening notifications.
   content::NotificationRegistrar registrar_;
 
   // True if the controller is waiting for a new preview dialog via
   // content::NAVIGATION_TYPE_NEW_PAGE.
   bool waiting_for_new_preview_page_;
 
   // Whether the PrintPreviewDialogController is in the middle of creating a
   // print preview dialog.
   bool is_creating_print_preview_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogController);
 };
 
 }  // namespace printing
 
 #endif  // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_