Skip to content

GitLab

T
tangled
Commit ae3f8b65 authored by jam@chromium.org's avatar jam@chromium.org
Browse files
Options

Move SSL resources out of browser\security\resources into browser\resources... 

Move SSL resources out of browser\security\resources into browser\resources alongside the rest of the resources (and interstitials).
Review URL: http://codereview.chromium.org/6326007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71872 0039d316-1c4b-4281-b951-d872f2087c98
parent 470425e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
chrome/browser/browser_resources.grd
View file @ ae3f8b65
...@@ -57,8 +57,8 @@ without changes to the corresponding grd file. etaa --> ...@@ -57,8 +57,8 @@ without changes to the corresponding grd file. etaa -->
<include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SIGNIN_HTML" file="resources\browser_signin.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SIGNIN_HTML" file="resources\browser_signin.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SYNC_ENCRYPTION_LOGIN_HTML" file="sync\resources\encryption_login.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_ENCRYPTION_LOGIN_HTML" file="sync\resources\encryption_login.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.html" flattenhtml="true" type="BINDATA" />
......
chrome/browser/resources/safe_browsing_malware_block.html
View file @ ae3f8b65
...@@ -143,7 +143,7 @@ label.checkbox > span { ...@@ -143,7 +143,7 @@ label.checkbox > span {
</head> </head>
<body oncontextmenu="return false;"> <body oncontextmenu="return false;">
<div class="background"><img src="../security/resources/ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div> <div class="background"><img src="ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div>
<table width="100%" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="0">
<td class="cell" valign="middle" align="center"> <td class="cell" valign="middle" align="center">
<div class="box"> <div class="box">
......
chrome/browser/resources/safe_browsing_multiple_threat_block.html
View file @ ae3f8b65
...@@ -110,7 +110,7 @@ function takeMeBack() { ...@@ -110,7 +110,7 @@ function takeMeBack() {
</head> </head>
<body oncontextmenu="return false;"> <body oncontextmenu="return false;">
<div class="background"><img src="../security/resources/ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div> <div class="background"><img src="ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div>
<table width="100%" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="0">
<td class="cell" valign="middle" align="center"> <td class="cell" valign="middle" align="center">
<div class="box"> <div class="box">
......
chrome/browser/resources/safe_browsing_phishing_block.html
View file @ ae3f8b65
...@@ -114,7 +114,7 @@ html[dir='rtl'] .helpbutton { ...@@ -114,7 +114,7 @@ html[dir='rtl'] .helpbutton {
</head> </head>
<body oncontextmenu="return false;"> <body oncontextmenu="return false;">
<div class="background"><img src="../security/resources/ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"></div> <div class="background"><img src="ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"></div>
<table width="100%" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="0">
<td class="cell" valign="middle" align="center"> <td class="cell" valign="middle" align="center">
<div class="box"> <div class="box">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment