Adds support for multiple malware/phishing resources in a page

chrome/browser/tab_contents/interstitial_page.h

 // Copyright (c) 2006-2008 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_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
 
 #include <string>
 
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
 class WebContents;
 
 // This class is a base class for interstitial pages, pages that show some
 // informative message asking for user validation before reaching the target
 // page. (Navigating to a page served over bad HTTPS or a page containing
 // malware are typical cases where an interstitial is required.)
 //
 // If specified in its constructor, this class creates a navigation entry so
 // that when the interstitial shows, the current entry is the target URL.
 //
 // InterstitialPage instances take care of deleting themselves when closed
 // through a navigation, the WebContents closing them or the tab containing them
 // being closed.
 
-enum ResourceRequestAction {
-  BLOCK,
-  RESUME,
-  CANCEL
-};
+enum ResourceRequestAction;
 
 class InterstitialPage : public NotificationObserver,
                          public RenderViewHostDelegate {
  public:
   // Creates an interstitial page to show in |tab|. |new_navigation| should be
   // set to true when the interstitial is caused by loading a new page, in which
   // case a temporary navigation entry is created with the URL |url| and
   // added to the navigation controller (so the interstitial page appears as a
   // new navigation entry). |new_navigation| should be false when the
   // interstitial was triggered by a loading a sub-resource in a page.
@@ skipping 99 matching lines @@
 
   // Whether the Proceed or DontProceed have been called yet.
   bool action_taken_;
 
   // Notification magic.
   NotificationRegistrar notification_registrar_;
 
   // The RenderViewHost displaying the interstitial contents.
   RenderViewHost* render_view_host_;
 
+  // The IDs for the RenderViewHost hidden by this interstitial.
+  int original_rvh_process_id_;
+  int original_rvh_id_;
+
   // Whether or not we should change the title of the tab when hidden (to revert
   // it to its original value).
   bool should_revert_tab_title_;
 
+  // Whether the ResourceDispatcherHost has been notified to cancel/resume the
+  // resource requests blocked for the RenderViewHost.
+  bool resource_dispatcher_host_notified_;
+
   // The original title of the tab that should be reverted to when the
   // interstitial is hidden.
   std::wstring original_tab_title_;
 
   MessageLoop* ui_loop_;
 
   // We keep a map of the various blocking pages shown as the UI tests need to
   // be able to retrieve them.
   typedef std::map<WebContents*,InterstitialPage*> InterstitialPageMap;
   static InterstitialPageMap* tab_to_interstitial_page_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
 };
 
 #endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_