Support manual (white|black)list, previewing and allowing after interstitial

chrome/browser/managed_mode/managed_mode_resource_throttle.h

Index: chrome/browser/managed_mode/managed_mode_resource_throttle.h
diff --git a/chrome/browser/managed_mode/managed_mode_resource_throttle.h b/chrome/browser/managed_mode/managed_mode_resource_throttle.h
index 886fb2a2d9b7930f1be01bbd6e6c74096991bdeb..ac6b4a675c335bfc2a65c87f81cfb52740c68b36 100644
--- a/chrome/browser/managed_mode/managed_mode_resource_throttle.h
+++ b/chrome/browser/managed_mode/managed_mode_resource_throttle.h
@@ -15,10 +15,6 @@ namespace net {
 class URLRequest;
 }
 
-namespace policy {
-class URLBlacklist;
-}
-
 class ManagedModeResourceThrottle : public content::ResourceThrottle {
  public:
   ManagedModeResourceThrottle(const net::URLRequest* request,
@@ -27,17 +23,32 @@ class ManagedModeResourceThrottle : public content::ResourceThrottle {
                               bool is_main_frame);
   virtual ~ManagedModeResourceThrottle();
 
+  // Adds/removes a temporary exception to filtering for a
+  // render_process_host_id and render_view_id pair to the preview map.
+  // Adding saves the last approved hostname in the map.
+  static void AddTemporaryException(int render_process_host_id,
+                                    int render_view_id,
+                                    const std::string& host);
+  static void RemoveTemporaryException(int render_process_host_id,
+                                       int render_view_id);
+
   // content::ResourceThrottle implementation:
   virtual void WillStartRequest(bool* defer) OVERRIDE;
 
+  virtual void WillRedirectRequest(const GURL& new_url, bool* defer) OVERRIDE;
+
  private:
   void OnInterstitialResult(bool continue_request);
+  void ShowInterstitialIfNeeded(bool is_redirect,

[Bernhard Bauer, 2012/11/28 14:21:05]

Small nit: If you switch the order of these two methods, it corresponds to the
order in which they're called.

[Sergiu, 2012/11/29 12:00:17]

Done.

+                                const GURL& url,
+                                bool* defer);
 
   base::WeakPtrFactory<ManagedModeResourceThrottle> weak_ptr_factory_;
   const net::URLRequest* request_;
   int render_process_host_id_;
   int render_view_id_;
   bool is_main_frame_;
+  bool after_interstitial_;
   const ManagedModeURLFilter* url_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedModeResourceThrottle);