diff options
| author | felt@chromium.org <felt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 07:19:07 +0000 |
|---|---|---|
| committer | felt@chromium.org <felt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 07:19:07 +0000 |
| commit | d26ff701b62b9ef17d484ff2ae333de79b31174b (patch) | |
| tree | 30109a9cc6b16d1b3f52a46201eb93db40b86993 /chrome/browser/browser_resources.grd | |
| parent | 3e52f3bc6c96b2dbe4835812ebe38663683b8ee6 (diff) | |
| download | chromium_src-d26ff701b62b9ef17d484ff2ae333de79b31174b.zip chromium_src-d26ff701b62b9ef17d484ff2ae333de79b31174b.tar.gz chromium_src-d26ff701b62b9ef17d484ff2ae333de79b31174b.tar.bz2 | |
- Make the V2 interstitial support non-overridable errors.
- Make the V2 interstitial the default, and the V1 non-default (Finch-controlled).
BUG=331453
for chrome/browser/browser_resources.grd:
TBR=sky@chromium.org
everything passes except the broken android gn thing:
NOTRY=true
Review URL: https://codereview.chromium.org/317573002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 56fc8ce..0d89ea9 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -72,7 +72,7 @@ <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network\network_config.js" flattenhtml="true" type="chrome_html" /> </if> <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="chrome_html" /> - <structure name="IRD_SSL_OVERRIDABLE_V2_HTML" file="resources\ssl\overridable_v2.html" flattenhtml="true" type="chrome_html" /> + <structure name="IRD_SSL_INTERSTITIAL_V2_HTML" file="resources\ssl\interstitial_v2.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> |