diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 22:55:14 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 22:55:14 +0000 |
| commit | 6c7af96d29d9fe4c89d94c3d29145dd5ca37453a (patch) | |
| tree | add1e11e369d5c94a0be7e4f9f3aa6468bb65307 /chrome/browser/managed_mode/managed_mode_interstitial.h | |
| parent | 44532ef942174f765bb48b402be5ce5e1ece4b01 (diff) | |
| download | chromium_src-6c7af96d29d9fe4c89d94c3d29145dd5ca37453a.zip chromium_src-6c7af96d29d9fe4c89d94c3d29145dd5ca37453a.tar.gz chromium_src-6c7af96d29d9fe4c89d94c3d29145dd5ca37453a.tar.bz2 | |
Revert 191182 "Show interstitial from ManagedModeNavigationObser..."
This revert is based on this flakiness dashboard report:
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=@DEPS - chromium.org&testType=browser_tests&tests=ManagedModeBlockModeTest.SimpleURLNotInAnyLists
Three previously non-flaky tests started flaking. We think this commit may be
the cause.
It's been a bad day for the waterfall, and we're anxious to keep the tree open,
so we decided to revert first and ask questions later.
> Show interstitial from ManagedModeNavigationObserver instead of ManagedModeResourceThrottle.
>
>
> BUG=168772
>
>
> Review URL: https://chromiumcodereview.appspot.com/12887005
TBR=bauerb@chromium.org
Review URL: https://codereview.chromium.org/13245006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/managed_mode/managed_mode_interstitial.h')
| -rw-r--r-- | chrome/browser/managed_mode/managed_mode_interstitial.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.h b/chrome/browser/managed_mode/managed_mode_interstitial.h index 1bfc346d..98aeaef 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.h +++ b/chrome/browser/managed_mode/managed_mode_interstitial.h @@ -28,6 +28,16 @@ class ManagedModeInterstitial : public content::InterstitialPageDelegate { const base::Callback<void(bool)>& callback); virtual ~ManagedModeInterstitial(); + // Should be called on the IO thread. + // |render_process_host_id| and |render_view_id| identify the WebContents + // where the request was blocked. |url| is the URL that was blocked. + // |callback| should be called with the result (whether to allow the request + // or not). + static void ShowInterstitial(int render_process_host_id, + int render_view_id, + const GURL& url, + const base::Callback<void(bool)>& callback); + private: void GoToNewTabPage(); @@ -40,6 +50,7 @@ class ManagedModeInterstitial : public content::InterstitialPageDelegate { // Will be called when the passphrase dialog is closed, which is shown after // clicking the preview button. void OnAuthorizationResult(bool success); + void DispatchContinueRequest(bool continue_request); // Owns the interstitial, which owns us. content::WebContents* web_contents_; |