summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 14:23:49 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 14:23:49 +0000
commitc04a87e737da6e610633b9bf4e270e394b387b05 (patch)
tree5d6555ef68d7128f92870a74533b88c225a03999 /chrome/common
parentb9fc13815c3476c751c6ca0f4b0f518bc8b736d3 (diff)
downloadchromium_src-c04a87e737da6e610633b9bf4e270e394b387b05.zip
chromium_src-c04a87e737da6e610633b9bf4e270e394b387b05.tar.gz
chromium_src-c04a87e737da6e610633b9bf4e270e394b387b05.tar.bz2
Converting Catblock to manifest_version 2.
Dropping background page entirely, as it was just running scripts. BUG=111049 TEST= Review URL: https://chromiumcodereview.appspot.com/9117031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/docs/examples/extensions/catblock.zipbin6185 -> 6495 bytes
-rw-r--r--chrome/common/extensions/docs/examples/extensions/catblock/background.js (renamed from chrome/common/extensions/docs/examples/extensions/catblock/background.html)8
-rw-r--r--chrome/common/extensions/docs/examples/extensions/catblock/loldogs.js4
-rw-r--r--chrome/common/extensions/docs/examples/extensions/catblock/manifest.json6
-rw-r--r--chrome/common/extensions/docs/samples.html2
-rw-r--r--chrome/common/extensions/docs/samples.json4
6 files changed, 15 insertions, 9 deletions
diff --git a/chrome/common/extensions/docs/examples/extensions/catblock.zip b/chrome/common/extensions/docs/examples/extensions/catblock.zip
index 1687f1a..41c0d9f 100644
--- a/chrome/common/extensions/docs/examples/extensions/catblock.zip
+++ b/chrome/common/extensions/docs/examples/extensions/catblock.zip
Binary files differ
diff --git a/chrome/common/extensions/docs/examples/extensions/catblock/background.html b/chrome/common/extensions/docs/examples/extensions/catblock/background.js
index d770612..2e555fd 100644
--- a/chrome/common/extensions/docs/examples/extensions/catblock/background.html
+++ b/chrome/common/extensions/docs/examples/extensions/catblock/background.js
@@ -1,6 +1,7 @@
-<!doctype html>
-<script src="loldogs.js"></script>
-<script>
+// Copyright (c) 2012 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.
+
// Simple extension to replace lolcat images from
// http://icanhascheezburger.com/ with loldog images instead.
@@ -21,4 +22,3 @@ chrome.webRequest.onBeforeRequest.addListener(
},
// extraInfoSpec
["blocking"]);
-</script>
diff --git a/chrome/common/extensions/docs/examples/extensions/catblock/loldogs.js b/chrome/common/extensions/docs/examples/extensions/catblock/loldogs.js
index 1de653b..a8013b1 100644
--- a/chrome/common/extensions/docs/examples/extensions/catblock/loldogs.js
+++ b/chrome/common/extensions/docs/examples/extensions/catblock/loldogs.js
@@ -1,3 +1,7 @@
+// Copyright (c) 2012 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.
+
var loldogs = [
"http://ihasahotdog.files.wordpress.com/2011/08/funny-dog-pictures-yoo-bin-warndid.jpg",
"http://ihasahotdog.files.wordpress.com/2011/08/funny-dog-pictures-it-juzz-liek-ezploded-or-sumfin.jpg",
diff --git a/chrome/common/extensions/docs/examples/extensions/catblock/manifest.json b/chrome/common/extensions/docs/examples/extensions/catblock/manifest.json
index 437cda5..a8dfd9d 100644
--- a/chrome/common/extensions/docs/examples/extensions/catblock/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/catblock/manifest.json
@@ -6,6 +6,8 @@
"http://icanhascheezburger.files.wordpress.com/*",
"http://chzmemebase.files.wordpress.com/*"],
"background": {
- "page": "background.html"
- }
+ "scripts": ["loldogs.js", "background.js"]
+ },
+
+ "manifest_version": 2
}
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 244e460..325077c 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -989,7 +989,7 @@
<div class="sourcefiles"><strong>Source files:</strong>
<ul>
<li>
- <code><a target="_blank" href="examples/extensions/catblock/background.html">background.html</a></code>
+ <code><a target="_blank" href="examples/extensions/catblock/background.js">background.js</a></code>
</li><li>
<code><a target="_blank" href="examples/extensions/catblock/loldogs.js">loldogs.js</a></code>
</li><li>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 6b84e16..9191245 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -511,11 +511,11 @@
],
"search_string": "CATBLOCK I CANT HAS CHEEZBURGER! BACKGROUND_PAGE WEBREQUEST WEBREQUESTBLOCKING CHROME.WEBREQUEST.ONBEFOREREQUEST",
"source_files": [
- "background.html",
+ "background.js",
"loldogs.js",
"manifest.json"
],
- "source_hash": "2e353468c48056fcc88de052d8a319ec7321fed5",
+ "source_hash": "c7436b496d47e4b851f6445eb3038f4445ee1549",
"zip_path": "examples\/extensions\/catblock.zip"
},
{