diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 12:43:41 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 12:43:41 +0000 |
commit | f9034cf01f5e8ab33c0c03553174da9cde8a80be (patch) | |
tree | ccce9f2307132e674a7d15361611df5615b1e1da /chrome/browser/prerender/prerender_config.h | |
parent | d1f0351663137617d0f68e03051c6fc26cad5ab0 (diff) | |
download | chromium_src-f9034cf01f5e8ab33c0c03553174da9cde8a80be.zip chromium_src-f9034cf01f5e8ab33c0c03553174da9cde8a80be.tar.gz chromium_src-f9034cf01f5e8ab33c0c03553174da9cde8a80be.tar.bz2 |
Allow prerendering of https pages.
This is specified as an optional configuration parameter. However, it's intended to remain true for some time.
The main change which was required was cancellation of the prerender page when there is an SSL Certificate issue on the top-level page.
BUG=88555
TEST=Go to prerender-test.appspot.com and prerender an https url, such as https://mail.google.com, observe that the prerender does not cancel. Also, do this for a site which redirects to https, such as http://mail.yahoo.com. Finally, browser tests and unit tests.
Review URL: http://codereview.chromium.org/7313006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_config.h')
-rw-r--r-- | chrome/browser/prerender/prerender_config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/prerender/prerender_config.h b/chrome/browser/prerender/prerender_config.h index d3ea812..a9ca690 100644 --- a/chrome/browser/prerender/prerender_config.h +++ b/chrome/browser/prerender/prerender_config.h @@ -24,6 +24,9 @@ struct Config { // Maximum age for a prerendered page until it is removed. base::TimeDelta max_age; + + // Is https allowed? + bool https_allowed; }; } // namespace prerender |