summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/about_conflicts.html1
-rw-r--r--chrome/browser/resources/about_flash.html1
-rw-r--r--chrome/browser/resources/about_memory.html1
-rw-r--r--chrome/browser/resources/about_memory_linux.html1
-rw-r--r--chrome/browser/resources/about_memory_mac.html1
-rw-r--r--chrome/browser/resources/about_stats.html1
-rw-r--r--chrome/browser/resources/about_version.html1
-rw-r--r--chrome/browser/resources/bug_report.html1
-rw-r--r--chrome/browser/resources/bug_report_invalid.html1
-rw-r--r--chrome/browser/resources/content_security_policy.html18
-rw-r--r--chrome/browser/resources/crashes.html1
-rw-r--r--chrome/browser/resources/downloads.html1
-rw-r--r--chrome/browser/resources/flags.html1
-rw-r--r--chrome/browser/resources/gpu_internals.html2
-rw-r--r--chrome/browser/resources/history.html1
-rw-r--r--chrome/browser/resources/history2.html1
-rw-r--r--chrome/browser/resources/hung_renderer_dialog.html1
-rw-r--r--chrome/browser/resources/media_internals.html1
-rw-r--r--chrome/browser/resources/net_internals/help.html3
-rw-r--r--chrome/browser/resources/net_internals/index.html1
-rw-r--r--chrome/browser/resources/options/options.html1
-rw-r--r--chrome/browser/resources/plugins.html1
-rw-r--r--chrome/browser/resources/policy.html1
-rw-r--r--chrome/browser/resources/print_preview/print_preview.html1
-rw-r--r--chrome/browser/resources/quota_internals/main.html1
-rw-r--r--chrome/browser/resources/sessions.html1
-rw-r--r--chrome/browser/resources/sync_internals/sync_index.html1
-rw-r--r--chrome/browser/resources/task_manager/main.html1
-rw-r--r--chrome/browser/resources/tracing.html2
-rw-r--r--chrome/browser/resources/workers/index.html1
30 files changed, 0 insertions, 51 deletions
diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html
index c0bb551..7a1f85a 100644
--- a/chrome/browser/resources/about_conflicts.html
+++ b/chrome/browser/resources/about_conflicts.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<style>
body {
margin: 10px;
diff --git a/chrome/browser/resources/about_flash.html b/chrome/browser/resources/about_flash.html
index 27c9b66..7c0ac83 100644
--- a/chrome/browser/resources/about_flash.html
+++ b/chrome/browser/resources/about_flash.html
@@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<html i18n-values="dir:textdirection;">
-<include src="content_security_policy.html"/>
<head>
<style>
.key {
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 8e1751d..7f2ca08 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -6,7 +6,6 @@ about:memory template page
<html id="t">
<head>
<title>About Memory</title>
- <include src="content_security_policy.html"/>
<link rel="stylesheet" href="shared/css/about_memory.css">
<style>
body {
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html
index 652f4bb..91021ba 100644
--- a/chrome/browser/resources/about_memory_linux.html
+++ b/chrome/browser/resources/about_memory_linux.html
@@ -6,7 +6,6 @@ about:memory template page
<html id="t">
<head>
<title>About Memory</title>
- <include src="content_security_policy.html"/>
<link rel="stylesheet" href="shared/css/about_memory.css">
<style>
body {
diff --git a/chrome/browser/resources/about_memory_mac.html b/chrome/browser/resources/about_memory_mac.html
index cd29dc5..ac75010 100644
--- a/chrome/browser/resources/about_memory_mac.html
+++ b/chrome/browser/resources/about_memory_mac.html
@@ -6,7 +6,6 @@ about:memory template page
<html id="t">
<head>
<title>About Memory</title>
- <include src="content_security_policy.html"/>
<link rel="stylesheet" href="shared/css/about_memory.css">
<style>
body {
diff --git a/chrome/browser/resources/about_stats.html b/chrome/browser/resources/about_stats.html
index 60111d1..421266e 100644
--- a/chrome/browser/resources/about_stats.html
+++ b/chrome/browser/resources/about_stats.html
@@ -3,7 +3,6 @@
<html id="t">
<head>
<title>About Stats</title>
-<include src="content_security_policy.html"/>
<style>
body {
border-top: 10px solid #3B85E3;
diff --git a/chrome/browser/resources/about_version.html b/chrome/browser/resources/about_version.html
index edc92f7..d7c13c4 100644
--- a/chrome/browser/resources/about_version.html
+++ b/chrome/browser/resources/about_version.html
@@ -7,7 +7,6 @@ about:version template page
<html id="t">
<head>
<title i18n-content="title"></title>
- <include src="content_security_policy.html"/>
<style>
body {
font-family:Helvetica,Arial,sans-serif;
diff --git a/chrome/browser/resources/bug_report.html b/chrome/browser/resources/bug_report.html
index 0405663..17311ad 100644
--- a/chrome/browser/resources/bug_report.html
+++ b/chrome/browser/resources/bug_report.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8"/>
-<include src="content_security_policy.html"/>
<title i18n-content="page-title"></title>
<!-- We want to keep our style in sync with the options page. -->
<link rel="stylesheet" href="chrome://resources/css/button.css">
diff --git a/chrome/browser/resources/bug_report_invalid.html b/chrome/browser/resources/bug_report_invalid.html
index bac77d2..103cb3f 100644
--- a/chrome/browser/resources/bug_report_invalid.html
+++ b/chrome/browser/resources/bug_report_invalid.html
@@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
</head>
<title i18n-content="title"></title>
<body style="-webkit-user-select: none">
diff --git a/chrome/browser/resources/content_security_policy.html b/chrome/browser/resources/content_security_policy.html
deleted file mode 100644
index efeeb78..0000000
--- a/chrome/browser/resources/content_security_policy.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (c) 2011 The Chromium Authors. All rights reserved.
- Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
--->
-<!-- X-WebKit-CSP is our development name for Content-Security-Policy.
- TODO(tsepez) rename when Content-security-policy is done.
- TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.
- TODO(tsepez) chrome-extension: permits the ChromeVox screen reader
- extension to function on these pages. Remove it when the extension
- is updated to stop injecting script into the pages.
--->
-<meta
- http-equiv="X-WebKit-CSP"
- content="object-src 'self';
- script-src chrome://resources
- chrome-extension://mndnfokpggljbaajbnioimlmbfngpief
- 'self'
- 'unsafe-eval'">
diff --git a/chrome/browser/resources/crashes.html b/chrome/browser/resources/crashes.html
index 9816989..4f8eeb7 100644
--- a/chrome/browser/resources/crashes.html
+++ b/chrome/browser/resources/crashes.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
- <include src="content_security_policy.html"/>
<title i18n-content="crashesTitle"></title>
<link rel="stylesheet" href="crashes.css">
<script src="chrome://resources/js/local_strings.js"></script>
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index 0fb4da2..f4540d8 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<title i18n-content="title"></title>
<link rel="icon" href="../../app/theme/downloads_favicon.png">
<style>
diff --git a/chrome/browser/resources/flags.html b/chrome/browser/resources/flags.html
index 503cfce..698f991 100644
--- a/chrome/browser/resources/flags.html
+++ b/chrome/browser/resources/flags.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<link rel="stylesheet" href="flags.css"/>
<script src="chrome://flags/flags.js"></script>
<script src="chrome://flags/strings.js"></script>
diff --git a/chrome/browser/resources/gpu_internals.html b/chrome/browser/resources/gpu_internals.html
index 33c55c7..420e1ce 100644
--- a/chrome/browser/resources/gpu_internals.html
+++ b/chrome/browser/resources/gpu_internals.html
@@ -6,8 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<head i18n-values="dir:textdirection;">
-<include src="content_security_policy.html"/>
-
<link rel="stylesheet" href="webui.css">
<style>
* {
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index 5e92220..0876d4a 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<title i18n-content="title"></title>
<link rel="icon" href="../../app/theme/history_favicon.png">
<script src="chrome://resources/js/local_strings.js"></script>
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index 36bdfe63..b28755a 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<title i18n-content="title"></title>
<link rel="icon" href="../../app/theme/history_favicon.png">
diff --git a/chrome/browser/resources/hung_renderer_dialog.html b/chrome/browser/resources/hung_renderer_dialog.html
index 16e7558..c52d75e 100644
--- a/chrome/browser/resources/hung_renderer_dialog.html
+++ b/chrome/browser/resources/hung_renderer_dialog.html
@@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
<title i18n-content="title"></title>
- <include src="content_security_policy.html"/>
<link rel="stylesheet" href="hung_renderer_dialog.css">
<link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
diff --git a/chrome/browser/resources/media_internals.html b/chrome/browser/resources/media_internals.html
index 4481890..718cbec 100644
--- a/chrome/browser/resources/media_internals.html
+++ b/chrome/browser/resources/media_internals.html
@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<head>
- <include src="content_security_policy.html"/>
<link rel="stylesheet" href="webui.css" />
<link rel="stylesheet" href="media_internals/media_internals.css" />
<script src="chrome://resources/js/cr.js"></script>
diff --git a/chrome/browser/resources/net_internals/help.html b/chrome/browser/resources/net_internals/help.html
index 033889e..54be2c7 100644
--- a/chrome/browser/resources/net_internals/help.html
+++ b/chrome/browser/resources/net_internals/help.html
@@ -4,9 +4,6 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<head>
- <include src="../content_security_policy.html"/>
-</head>
<body>
<div id=howtoDumpForBugsHelpContent>
<h2>How to get data for bug reports</h2>
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index 5037ac8..48f099c 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<head i18n-values="dir:textdirection;">
- <include src="../content_security_policy.html"/>
<link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="events_view.css">
<link rel="stylesheet" href="logs_view.css">
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 61b7243..268b37b 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -2,7 +2,6 @@
<html id="t" i18n-values="dir:textdirection">
<head>
<meta charset="utf-8">
-<include src="../content_security_policy.html"/>
<!-- Set the title to that of the default page so that the title doesn't flash
on load (for the most common case). -->
<title i18n-content="browserPageTabTitle"></title>
diff --git a/chrome/browser/resources/plugins.html b/chrome/browser/resources/plugins.html
index d6eebc6..f933211 100644
--- a/chrome/browser/resources/plugins.html
+++ b/chrome/browser/resources/plugins.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="content_security_policy.html"/>
<title i18n-content="pluginsTitle"></title>
<link rel="stylesheet" href="plugins.css"/>
</head>
diff --git a/chrome/browser/resources/policy.html b/chrome/browser/resources/policy.html
index bb61d67..f37f7f2 100644
--- a/chrome/browser/resources/policy.html
+++ b/chrome/browser/resources/policy.html
@@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
<title i18n-content="policyTitle"></title>
-<include src="content_security_policy.html"/>
<link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="policy.css">
<link rel="stylesheet" href="webui.css">
diff --git a/chrome/browser/resources/print_preview/print_preview.html b/chrome/browser/resources/print_preview/print_preview.html
index ea168fc..083c60d 100644
--- a/chrome/browser/resources/print_preview/print_preview.html
+++ b/chrome/browser/resources/print_preview/print_preview.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<include src="../content_security_policy.html"/>
<title i18n-content="title"></title>
<link rel="icon" href="../../../app/theme/print_preview_favicon.png">
<link rel="stylesheet" href="../webui.css">
diff --git a/chrome/browser/resources/quota_internals/main.html b/chrome/browser/resources/quota_internals/main.html
index 64972c4..e8f9aae 100644
--- a/chrome/browser/resources/quota_internals/main.html
+++ b/chrome/browser/resources/quota_internals/main.html
@@ -5,7 +5,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<html i18n-values="dir:textdirection;">
-<include src="../content_security_policy.html"/>
<title>Quota Internals</title>
<link rel="stylesheet" href="main.css"/>
diff --git a/chrome/browser/resources/sessions.html b/chrome/browser/resources/sessions.html
index d70c343..2add606 100644
--- a/chrome/browser/resources/sessions.html
+++ b/chrome/browser/resources/sessions.html
@@ -2,7 +2,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
- <include src="content_security_policy.html"/>
<title i18n-content="sessionsTitle"></title>
<link rel="stylesheet" href="sessions.css">
<script src="chrome://resources/js/local_strings.js"></script>
diff --git a/chrome/browser/resources/sync_internals/sync_index.html b/chrome/browser/resources/sync_internals/sync_index.html
index 4d2c5d9..74d67f6 100644
--- a/chrome/browser/resources/sync_internals/sync_index.html
+++ b/chrome/browser/resources/sync_internals/sync_index.html
@@ -4,7 +4,6 @@
<!-- If you change the title, make sure you also update
chrome/test/functional/special_tabs.py. -->
<title>Sync Internals</title>
-<include src="../content_security_policy.html"/>
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/tabs.css">
<link rel="stylesheet" href="chrome://resources/css/tree.css">
diff --git a/chrome/browser/resources/task_manager/main.html b/chrome/browser/resources/task_manager/main.html
index e9bb32b..82eab9a 100644
--- a/chrome/browser/resources/task_manager/main.html
+++ b/chrome/browser/resources/task_manager/main.html
@@ -7,7 +7,6 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
- <include src="../content_security_policy.html"/>
<title i18n-content="TITLE"></title>
<script src="chrome://tasks/includes.js"></script>
<script src="chrome://tasks/main.js"></script>
diff --git a/chrome/browser/resources/tracing.html b/chrome/browser/resources/tracing.html
index 3abbec8..07b81be 100644
--- a/chrome/browser/resources/tracing.html
+++ b/chrome/browser/resources/tracing.html
@@ -6,8 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<head i18n-values="dir:textdirection;">
-<include src="content_security_policy.html"/>
-
<link rel="stylesheet" href="webui.css">
<style>
* {
diff --git a/chrome/browser/resources/workers/index.html b/chrome/browser/resources/workers/index.html
index 5f34e21..7ca8f69 100644
--- a/chrome/browser/resources/workers/index.html
+++ b/chrome/browser/resources/workers/index.html
@@ -4,7 +4,6 @@
found in the LICENSE file.
-->
<html>
-<include src="../content_security_policy.html"/>
<title>Workers</title>
<style>
thead {