| Index: chrome/browser/resources/about_conflicts.html
|
| ===================================================================
|
| --- chrome/browser/resources/about_conflicts.html (revision 92230)
|
| +++ chrome/browser/resources/about_conflicts.html (working copy)
|
| @@ -2,6 +2,9 @@
|
| <html i18n-values="dir:textdirection;">
|
| <head>
|
| <meta charset="utf-8">
|
| +<meta http-equiv="X-WebKit-CSP"
|
| + content="object-src 'none';
|
| + script-src chrome://resources 'self' 'unsafe-eval'">
|
| <style>
|
| body {
|
| margin: 10px;
|
| @@ -144,68 +147,6 @@
|
| border-bottom: 1px solid #aaa;
|
| }
|
| </style>
|
| -<script>
|
| -
|
| - /**
|
| - * This variable structure is here to document the structure that the template
|
| - * expects to correctly populate the page.
|
| - */
|
| - var moduleListDataFormat = {
|
| - 'moduleList': [
|
| - {
|
| - 'type': 'The type of module found',
|
| - 'type_description':
|
| - 'The type of module (string), defaults to blank for regular modules',
|
| - 'status': 'The module status',
|
| - 'location': 'The module path, not including filename',
|
| - 'name': 'The name of the module',
|
| - 'product_name': 'The name of the product the module belongs to',
|
| - 'description': 'The module description',
|
| - 'version': 'The module version',
|
| - 'digital_signer': 'The signer of the digital certificate for the module',
|
| - 'recommended_action': 'The help tips bitmask',
|
| - 'possible_resolution': 'The help tips in string form',
|
| - 'help_url': 'The link to the Help Center article'
|
| - }
|
| - ]
|
| - };
|
| -
|
| - /**
|
| - * Takes the |moduleListData| input argument which represents data about
|
| - * the currently available modules and populates the html jstemplate
|
| - * with that data. It expects an object structure like the above.
|
| - * @param {Object} moduleListData Information about available modules
|
| - */
|
| - function renderTemplate(moduleListData) {
|
| - // This is the javascript code that processes the template:
|
| - var input = new JsEvalContext(moduleListData);
|
| - var output = document.getElementById('modulesTemplate');
|
| - jstProcess(input, output);
|
| - }
|
| -
|
| - /**
|
| - * Asks the C++ ConflictsDOMHandler to get details about the available modules
|
| - * and return detailed data about the configuration. The ConflictsDOMHandler
|
| - * should reply to returnModuleList() (below).
|
| - */
|
| - function requestModuleListData() {
|
| - chrome.send('requestModuleList', []);
|
| - }
|
| -
|
| - /**
|
| - * Called by the WebUI to re-populate the page with data representing the
|
| - * current state of installed modules.
|
| - */
|
| - function returnModuleList(moduleListData) {
|
| - renderTemplate(moduleListData);
|
| - document.getElementById('loading-message').style.visibility = 'hidden';
|
| - document.getElementById('body-container').style.visibility = 'visible';
|
| - }
|
| -
|
| - // Get data and have it displayed upon loading.
|
| - document.addEventListener('DOMContentLoaded', requestModuleListData);
|
| -
|
| -</script>
|
| </head>
|
| <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
|
| <div id="loading-message" i18n-content="loadingMessage">LOADING_MESSAGE</div>
|
| @@ -309,5 +250,10 @@
|
| </div>
|
| </div>
|
| </div>
|
| +<script src="chrome://conflicts/strings.js"></script>
|
| +<script src="chrome://conflicts/conflicts.js"></script>
|
| +<script src="chrome://resources/js/i18n_template.js"></script>
|
| +<script src="chrome://resources/js/i18n_process.js"></script>
|
| +<script src="chrome://resources/js/jstemplate_compiled.js"></script>
|
| </body>
|
| </html>
|
|
|
Chromium Code Reviews
Issue 7277010:
Apply CSP to about:conflicts page. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/