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..c74cb8136b4fe3dd41f483cd63b32e609656d976 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,10 +23,24 @@ 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 ShowInterstitialIfNeeded(bool is_redirect, |
+ const GURL& url, |
+ bool* defer); |
void OnInterstitialResult(bool continue_request); |
base::WeakPtrFactory<ManagedModeResourceThrottle> weak_ptr_factory_; |
@@ -38,6 +48,7 @@ class ManagedModeResourceThrottle : public content::ResourceThrottle { |
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); |