summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeaufort.francois@gmail.com <beaufort.francois@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-27 12:10:52 +0000
committerbeaufort.francois@gmail.com <beaufort.francois@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-27 12:10:52 +0000
commit9742efa71caf569fff2c2af16da62627b7837d8c (patch)
tree12db09e1ea14fbac3d2f976e758811ae91101436
parent74b221108443988495eec441e0ac02293e36efef (diff)
downloadchromium_src-9742efa71caf569fff2c2af16da62627b7837d8c.zip
chromium_src-9742efa71caf569fff2c2af16da62627b7837d8c.tar.gz
chromium_src-9742efa71caf569fff2c2af16da62627b7837d8c.tar.bz2
[DocServer] Fixed CSP Errors in Bookmarks and DeviceInfo Sample Extensions
BUG=299634 NOTRY=true Review URL: https://codereview.chromium.org/25019002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225694 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json4
-rw-r--r--chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html21
-rw-r--r--chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json4
-rw-r--r--chrome/common/extensions/docs/examples/api/deviceInfo/basic/popup.html2
4 files changed, 12 insertions, 19 deletions
diff --git a/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json b/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
index 8288e96..2135c3c 100644
--- a/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
@@ -1,12 +1,12 @@
{
"name": "My Bookmarks",
- "version": "1.0",
+ "version": "1.1",
"description": "A browser action with a popup dump of all bookmarks, including search, add, edit and delete.",
"permissions": [
"bookmarks"
],
"browser_action": {
- "default_title": "My Bookmarks.",
+ "default_title": "My Bookmarks",
"default_icon": "icon.png",
"default_popup": "popup.html"
},
diff --git a/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html b/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html
index 9baa86e..2a3370b 100644
--- a/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html
@@ -1,20 +1,13 @@
<html>
<head>
-<link type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/base/jquery-ui.css" rel="stylesheet">
-<style>
-div, td, th { color: black; }
-</style>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
-<script src="popup.js"></script>
-<script>
-</script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+ <script src="popup.js"></script>
</head>
<body style="width: 400px">
-<div>Search Bookmarks: <input id="search"></div>
-<div id="bookmarks"></div>
-<div id="editdialog"></div>
-<div id="deletedialog"></div>
-<div id="adddialog"></div>
+ <div>Search Bookmarks: <input id="search"></div>
+ <div id="bookmarks"></div>
+ <div id="editdialog"></div>
+ <div id="deletedialog"></div>
+ <div id="adddialog"></div>
</body>
</html>
diff --git a/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json b/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json
index 734a23f..4d376d8 100644
--- a/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json
@@ -1,12 +1,12 @@
{
"name": "My Devices",
- "version": "1.0",
+ "version": "1.1",
"description": "A browser action with a popup dump of all devices signed into the same account as the current profile.",
"permissions": [
"signedInDevices"
],
"browser_action": {
- "default_title": "My Devices.",
+ "default_title": "My Devices",
"default_icon": "icon.png",
"default_popup": "popup.html"
},
diff --git a/chrome/common/extensions/docs/examples/api/deviceInfo/basic/popup.html b/chrome/common/extensions/docs/examples/api/deviceInfo/basic/popup.html
index 37ecc47..4b46611 100644
--- a/chrome/common/extensions/docs/examples/api/deviceInfo/basic/popup.html
+++ b/chrome/common/extensions/docs/examples/api/deviceInfo/basic/popup.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="popup.js"></script>
</head>
<body style="width: 400px">