summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_contents.h
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-18 16:35:21 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-18 16:35:21 +0000
commit4c8d85bc5e1750ec4dbeb7732c9d4dbdd716edbb (patch)
treefcdc6716e1024b2fb37dbaee5e36dd5902aca2ab /chrome/browser/prerender/prerender_contents.h
parente7bb319a3bf850f6c8f3cf2d5236f1ed02ef9abe (diff)
downloadchromium_src-4c8d85bc5e1750ec4dbeb7732c9d4dbdd716edbb.zip
chromium_src-4c8d85bc5e1750ec4dbeb7732c9d4dbdd716edbb.tar.gz
chromium_src-4c8d85bc5e1750ec4dbeb7732c9d4dbdd716edbb.tar.bz2
Revert 75393 - Cancel prerender if any of the visited URLs are https.
BUG=72486 TEST=added new unit_tests and browser_tests Manual Test: With preendering enabled, do a search for "yahoo mail". Prerendering should be canceled due to https. Review URL: http://codereview.chromium.org/6523062 TBR=cbentzel@chromium.org Review URL: http://codereview.chromium.org/6543010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_contents.h')
-rw-r--r--chrome/browser/prerender/prerender_contents.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 7b631f4..f558dd7 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -189,9 +189,7 @@ class PrerenderContents : public RenderViewHostDelegate,
void OnUpdateFavIconURL(int32 page_id, const GURL& icon_url);
- // Adds an alias URL, for one of the many redirections. Returns whether
- // the URL is valid.
- bool AddAliasURL(const GURL& url);
+ void AddAliasURL(const GURL& url);
// Remove |this| from the PrerenderManager, set a final status, and
// delete |this|.