chrome/browser/resources/about_conflicts.html - Issue 7396026: Consolidate content-security-policy markup

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/about_conflicts.html

Issue 7396026: Consolidate content-security-policy markup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection;">	2 <html i18n-values="dir:textdirection;">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <meta http-equiv="X-WebKit-CSP"	5 <include src="content_security_policy.html"/>

6 content="object-src 'none';

7 script-src chrome://resources 'self' 'unsafe-eval'">

8 <style>	6 <style>

9 body {	7 body {

10 margin: 10px;	8 margin: 10px;

11 min-width: 47em;	9 min-width: 47em;

12 }	10 }

13	11

14 a {	12 a {

15 color: blue;	13 color: blue;

16 font-size: 103%;	14 font-size: 103%;

17 }	15 }

(...skipping 232 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250 </div>	248 </div>

251 </div>	249 </div>

252 </div>	250 </div>

253 <script src="chrome://conflicts/strings.js"></script>	251 <script src="chrome://conflicts/strings.js"></script>

254 <script src="chrome://conflicts/conflicts.js"></script>	252 <script src="chrome://conflicts/conflicts.js"></script>

255 <script src="chrome://resources/js/i18n_template.js"></script>	253 <script src="chrome://resources/js/i18n_template.js"></script>

256 <script src="chrome://resources/js/i18n_process.js"></script>	254 <script src="chrome://resources/js/i18n_process.js"></script>

257 <script src="chrome://resources/js/jstemplate_compiled.js"></script>	255 <script src="chrome://resources/js/jstemplate_compiled.js"></script>

258 </body>	256 </body>

259 </html>	257 </html>

OLD	NEW