Updating a few extensions to `manifest_version` 2.

* basic/set_page_color * browserAction/print * bookmarks/basic. BUG=111049 TEST= Review URL: https://chromiumcodereview.appspot.com/9200014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119072 0039d316-1c4b-4281-b951-d872f2087c98
author: mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-01-25 15:27:12 +0000
committer: mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-01-25 15:27:12 +0000
commit: 80b62eef8bad3345619934894244829e1c205dc4 (patch)
tree: 33f9582e3ad273f14c188de51d683bedc121c4bc
parent: b2401b8e549e5d788fcee92a3b8c7d018f55aff1 (diff)
download: chromium_src-80b62eef8bad3345619934894244829e1c205dc4.zip
chromium_src-80b62eef8bad3345619934894244829e1c205dc4.tar.gz
chromium_src-80b62eef8bad3345619934894244829e1c205dc4.tar.bz2
14 files changed, 222 insertions, 184 deletions
diff --git a/chrome/common/extensions/docs/examples/api/bookmarks/basic.zip b/chrome/common/extensions/docs/examples/api/bookmarks/basic.zip
index 447d530..5f589f5 100644
--- a/chrome/common/extensions/docs/examples/api/bookmarks/basic.zip
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic.zip
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 e16d3cf..a42819b 100644
--- a/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
@@ -9,5 +9,7 @@
       "default_title": "My Bookmarks.",
       "default_icon": "icon.png",
       "default_popup": "popup.html"
-  }
+  },
+  "manifest_version": 2,
+  "content_security_policy": "script-src 'self' https://ajax.googleapis.com; object-src 'self'"
 }
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 377b74a..9baa86e 100644
--- a/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.html
@@ -1,135 +1,16 @@
 <html>
 <head>
-<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/base/jquery-ui.css" rel="stylesheet">
+<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="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
+<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>
-  // Search the bookmarks when entering the search keyword.
-  $(function() {
-    $('#search').change(function() {
-       $('#bookmarks').empty();
-       dumpBookmarks($('#search').val());
-    });
-  });
-  // Traverse the bookmark tree, and print the folder and nodes.
-  function dumpBookmarks(query) {
-    var bookmarkTreeNodes = chrome.bookmarks.getTree(
-      function(bookmarkTreeNodes) {
-        $('#bookmarks').append(dumpTreeNodes(bookmarkTreeNodes, query));
-      });
-  }
-  function dumpTreeNodes(bookmarkNodes, query) {
-    var list = $('<ul>');
-    var i;
-    for (i = 0; i < bookmarkNodes.length; i++) {
-      list.append(dumpNode(bookmarkNodes[i], query));
-    }
-    return list;
-  }
-  function dumpNode(bookmarkNode, query) {
-    if (bookmarkNode.title) {
-      if (query && !bookmarkNode.children) {
-        if (String(bookmarkNode.title).indexOf(query) == -1) {
-          return $('<span></span>');
-        }
-      }
-      var anchor = $('<a>');
-      anchor.attr('href', bookmarkNode.url);
-      anchor.text(bookmarkNode.title);
-      /*
-       * When clicking on a bookmark in the extension, a new tab is fired with
-       * the bookmark url.
-       */
-      anchor.click(function() {
-        chrome.tabs.create({url: bookmarkNode.url});
-      });
-      var span = $('<span>');
-      var options = bookmarkNode.children ?
-        $('<span>[<a href="#" id="addlink">Add</a>]</span>') :
-        $('<span>[<a id="editlink" href="#">Edit</a> <a id="deletelink" ' +
-          'href="#">Delete</a>]</span>');
-      var edit = bookmarkNode.children ? $('<table><tr><td>Name</td><td>' +
-        '<input id="title"></td></tr><tr><td>URL</td><td><input id="url">' +
-        '</td></tr></table>') : $('<input>');
-      // Show add and edit links when hover over.
-          span.hover(function() {
-          span.append(options);
-          $('#deletelink').click(function() {
-            $('#deletedialog').empty().dialog({
-                   autoOpen: false,
-                   title: 'Confirm Deletion',
-                   resizable: false,
-                   height: 140,
-                   modal: true,
-                   overlay: {
-                     backgroundColor: '#000',
-                     opacity: 0.5
-                   },
-                   buttons: {
-                     'Yes, Delete It!': function() {
-                        chrome.bookmarks.remove(String(bookmarkNode.id));
-                        span.parent().remove();
-                        $(this).dialog('destroy');
-                      },
-                      Cancel: function() {
-                        $(this).dialog('destroy');
-                      }
-                   }
-                 }).dialog('open');
-           });
-          $('#addlink').click(function() {
-            $('#adddialog').empty().append(edit).dialog({autoOpen: false,
-              closeOnEscape: true, title: 'Add New Bookmark', modal: true,
-              buttons: {
-              'Add' : function() {
-                 chrome.bookmarks.create({parentId: bookmarkNode.id,
-                   title: $('#title').val(), url: $('#url').val()});
-                 $('#bookmarks').empty();
-                 $(this).dialog('destroy');
-                 window.dumpBookmarks();
-               },
-              'Cancel': function() {
-                 $(this).dialog('destroy');
-              }
-            }}).dialog('open');
-          });
-          $('#editlink').click(function() {
-           edit.val(anchor.text());
-           $('#editdialog').empty().append(edit).dialog({autoOpen: false,
-             closeOnEscape: true, title: 'Edit Title', modal: true,
-             show: 'slide', buttons: {
-                'Save': function() {
-                   chrome.bookmarks.update(String(bookmarkNode.id), {
-                     title: edit.val()
-                   });
-                   anchor.text(edit.val());
-                   options.show();
-                   $(this).dialog('destroy');
-                },
-               'Cancel': function() {
-                   $(this).dialog('destroy');
-               }
-           }}).dialog('open');
-          });
-          options.fadeIn();
-        },
-        // unhover
-        function() {
-          options.remove();
-        }).append(anchor);
-    }
-    var li = $(bookmarkNode.title ? '<li>' : '<div>').append(span);
-    if (bookmarkNode.children && bookmarkNode.children.length > 0) {
-      li.append(dumpTreeNodes(bookmarkNode.children, query));
-    }
-    return li;
-  }
 </script>
 </head>
-<body onload="dumpBookmarks();" style="width: 400px">
+<body style="width: 400px">
 <div>Search Bookmarks: <input id="search"></div>
 <div id="bookmarks"></div>
 <div id="editdialog"></div>
diff --git a/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.js b/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.js
new file mode 100644
index 0000000..ca72daa
--- /dev/null
+++ b/chrome/common/extensions/docs/examples/api/bookmarks/basic/popup.js
@@ -0,0 +1,128 @@
+// 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.
+
+// Search the bookmarks when entering the search keyword.
+$(function() {
+  $('#search').change(function() {
+     $('#bookmarks').empty();
+     dumpBookmarks($('#search').val());
+  });
+});
+// Traverse the bookmark tree, and print the folder and nodes.
+function dumpBookmarks(query) {
+  var bookmarkTreeNodes = chrome.bookmarks.getTree(
+    function(bookmarkTreeNodes) {
+      $('#bookmarks').append(dumpTreeNodes(bookmarkTreeNodes, query));
+    });
+}
+function dumpTreeNodes(bookmarkNodes, query) {
+  var list = $('<ul>');
+  var i;
+  for (i = 0; i < bookmarkNodes.length; i++) {
+    list.append(dumpNode(bookmarkNodes[i], query));
+  }
+  return list;
+}
+function dumpNode(bookmarkNode, query) {
+  if (bookmarkNode.title) {
+    if (query && !bookmarkNode.children) {
+      if (String(bookmarkNode.title).indexOf(query) == -1) {
+        return $('<span></span>');
+      }
+    }
+    var anchor = $('<a>');
+    anchor.attr('href', bookmarkNode.url);
+    anchor.text(bookmarkNode.title);
+    /*
+     * When clicking on a bookmark in the extension, a new tab is fired with
+     * the bookmark url.
+     */
+    anchor.click(function() {
+      chrome.tabs.create({url: bookmarkNode.url});
+    });
+    var span = $('<span>');
+    var options = bookmarkNode.children ?
+      $('<span>[<a href="#" id="addlink">Add</a>]</span>') :
+      $('<span>[<a id="editlink" href="#">Edit</a> <a id="deletelink" ' +
+        'href="#">Delete</a>]</span>');
+    var edit = bookmarkNode.children ? $('<table><tr><td>Name</td><td>' +
+      '<input id="title"></td></tr><tr><td>URL</td><td><input id="url">' +
+      '</td></tr></table>') : $('<input>');
+    // Show add and edit links when hover over.
+        span.hover(function() {
+        span.append(options);
+        $('#deletelink').click(function() {
+          $('#deletedialog').empty().dialog({
+                 autoOpen: false,
+                 title: 'Confirm Deletion',
+                 resizable: false,
+                 height: 140,
+                 modal: true,
+                 overlay: {
+                   backgroundColor: '#000',
+                   opacity: 0.5
+                 },
+                 buttons: {
+                   'Yes, Delete It!': function() {
+                      chrome.bookmarks.remove(String(bookmarkNode.id));
+                      span.parent().remove();
+                      $(this).dialog('destroy');
+                    },
+                    Cancel: function() {
+                      $(this).dialog('destroy');
+                    }
+                 }
+               }).dialog('open');
+         });
+        $('#addlink').click(function() {
+          $('#adddialog').empty().append(edit).dialog({autoOpen: false,
+            closeOnEscape: true, title: 'Add New Bookmark', modal: true,
+            buttons: {
+            'Add' : function() {
+               chrome.bookmarks.create({parentId: bookmarkNode.id,
+                 title: $('#title').val(), url: $('#url').val()});
+               $('#bookmarks').empty();
+               $(this).dialog('destroy');
+               window.dumpBookmarks();
+             },
+            'Cancel': function() {
+               $(this).dialog('destroy');
+            }
+          }}).dialog('open');
+        });
+        $('#editlink').click(function() {
+         edit.val(anchor.text());
+         $('#editdialog').empty().append(edit).dialog({autoOpen: false,
+           closeOnEscape: true, title: 'Edit Title', modal: true,
+           show: 'slide', buttons: {
+              'Save': function() {
+                 chrome.bookmarks.update(String(bookmarkNode.id), {
+                   title: edit.val()
+                 });
+                 anchor.text(edit.val());
+                 options.show();
+                 $(this).dialog('destroy');
+              },
+             'Cancel': function() {
+                 $(this).dialog('destroy');
+             }
+         }}).dialog('open');
+        });
+        options.fadeIn();
+      },
+      // unhover
+      function() {
+        options.remove();
+      }).append(anchor);
+  }
+  var li = $(bookmarkNode.title ? '<li>' : '<div>').append(span);
+  if (bookmarkNode.children && bookmarkNode.children.length > 0) {
+    li.append(dumpTreeNodes(bookmarkNode.children, query));
+  }
+  return li;
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+  dumpBookmarks();
+});
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/print.zip b/chrome/common/extensions/docs/examples/api/browserAction/print.zip
index 9c38a3c..f3b9154 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/print.zip
+++ b/chrome/common/extensions/docs/examples/api/browserAction/print.zip
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json b/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json
index d89fbe5..c4ea105 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json
@@ -11,5 +11,6 @@
   "browser_action": {
       "default_title": "Print this page",
       "default_icon": "print_16x16.png"
-  }
+  },
+  "manifest_version": 2
 }
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color.zip b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color.zip
index c1a6ff1..7adcc79 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color.zip
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color.zip
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json
index 95d28f7..4bcdf09 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json
@@ -8,5 +8,6 @@
       "default_title": "Set this page's color.",
       "default_icon": "icon.png",
       "default_popup": "popup.html"
-  }
+  },
+  "manifest_version": 2
 }
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
index 9230254..bf1b42b 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
@@ -1,53 +1,55 @@
-<style>
-body {
-  overflow: hidden;
-  margin: 0px;
-  padding: 0px;
-  background: white;
-}
+<!doctype html>
+<html>
+  <head>
+    <title>Set Page Color Popup</title>
+    <style>
+    body {
+      overflow: hidden;
+      margin: 0px;
+      padding: 0px;
+      background: white;
+    }
 
-div:first-child {
-  margin-top: 0px;
-}
+    div:first-child {
+      margin-top: 0px;
+    }
 
-div {
-  cursor: pointer;
-  text-align: center;
-  padding: 1px 3px;
-  font-family: sans-serif;
-  font-size: 0.8em;
-  width: 100px;
-  margin-top: 1px;
-  background: #cccccc;
-}
-div:hover {
-  background: #aaaaaa;
-}
-#red {
-  border: 1px solid red;
-  color: red;
-}
-#blue {
-  border: 1px solid blue;
-  color: blue;
-}
-#green {
-  border: 1px solid green;
-  color: green;
-}
-#yellow {
-  border: 1px solid yellow;
-  color: yellow;
-}
-</style>
-<script>
-function click(color) {
-  chrome.tabs.executeScript(null,
-      {code:"document.body.style.backgroundColor='" + color.id + "'"});
-  window.close();
-}
-</script>
-<div onclick="click(this)" id="red">red</div>
-<div onclick="click(this)" id="blue">blue</div>
-<div onclick="click(this)" id="green">green</div>
-<div onclick="click(this)" id="yellow">yellow</div>
+    div {
+      cursor: pointer;
+      text-align: center;
+      padding: 1px 3px;
+      font-family: sans-serif;
+      font-size: 0.8em;
+      width: 100px;
+      margin-top: 1px;
+      background: #cccccc;
+    }
+    div:hover {
+      background: #aaaaaa;
+    }
+    #red {
+      border: 1px solid red;
+      color: red;
+    }
+    #blue {
+      border: 1px solid blue;
+      color: blue;
+    }
+    #green {
+      border: 1px solid green;
+      color: green;
+    }
+    #yellow {
+      border: 1px solid yellow;
+      color: yellow;
+    }
+    </style>
+    <script src="popup.js"></script>
+  </head>
+  <body>
+    <div id="red">red</div>
+    <div id="blue">blue</div>
+    <div id="green">green</div>
+    <div id="yellow">yellow</div>
+  </body>
+</html>
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.js b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.js
new file mode 100644
index 0000000..516c2ba
--- /dev/null
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.js
@@ -0,0 +1,17 @@
+// 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.
+
+
+function click(e) {
+  chrome.tabs.executeScript(null,
+      {code:"document.body.style.backgroundColor='" + e.target.id + "'"});
+  window.close();
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+  var divs = document.querySelectorAll('div');
+  for (var i = 0; i < divs.length; i++) {
+    divs[i].addEventListener('click', click);
+  }
+});
diff --git a/chrome/common/extensions/docs/examples/extensions/catblock.zip b/chrome/common/extensions/docs/examples/extensions/catblock.zip
index 41c0d9f..d71d6be 100644
--- a/chrome/common/extensions/docs/examples/extensions/catblock.zip
+++ b/chrome/common/extensions/docs/examples/extensions/catblock.zip
diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings.zip b/chrome/common/extensions/docs/examples/extensions/plugin_settings.zip
index 5367360..ff78d72 100644
--- a/chrome/common/extensions/docs/examples/extensions/plugin_settings.zip
+++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings.zip
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 7227b75..11788bf 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -563,6 +563,8 @@
         <code><a target="_blank" href="examples/api/browserAction/set_page_color/manifest.json">manifest.json</a></code>
       </li><li>
         <code><a target="_blank" href="examples/api/browserAction/set_page_color/popup.html">popup.html</a></code>
+      </li><li>
+        <code><a target="_blank" href="examples/api/browserAction/set_page_color/popup.js">popup.js</a></code>
       </li>
     </ul>
   </div>
@@ -2738,6 +2740,8 @@
         <code><a target="_blank" href="examples/api/bookmarks/basic/manifest.json">manifest.json</a></code>
       </li><li>
         <code><a target="_blank" href="examples/api/bookmarks/basic/popup.html">popup.html</a></code>
+      </li><li>
+        <code><a target="_blank" href="examples/api/bookmarks/basic/popup.js">popup.js</a></code>
       </li>
     </ul>
   </div>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 4f3c1c6..b2e3e5e 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -257,9 +257,10 @@
       "search_string": "A BROWSER ACTION WITH A POPUP THAT CHANGES THE PAGE COLOR.  BROWSER_ACTION TABS CHROME.TABS.EXECUTESCRIPT",
       "source_files": [
         "manifest.json",
-        "popup.html"
+        "popup.html",
+        "popup.js"
       ],
-      "source_hash": "b016d5b2a4f51f7d13c3030fe18073b2329be4be",
+      "source_hash": "af55178e9d4821c0330f6b4b8e043eb4501ade40",
       "zip_path": "examples\/api\/browserAction\/set_page_color.zip"
     },
     {
@@ -515,7 +516,7 @@
         "loldogs.js",
         "manifest.json"
       ],
-      "source_hash": "c7436b496d47e4b851f6445eb3038f4445ee1549",
+      "source_hash": "337123f95c4686670c97e6fd07177fee9df2b9b0",
       "zip_path": "examples\/extensions\/catblock.zip"
     },
     {
@@ -1513,9 +1514,10 @@
       "search_string": "MY BOOKMARKS A BROWSER ACTION WITH A POPUP DUMP OF ALL BOOKMARKS, INCLUDING SEARCH, ADD, EDIT AND DELETE. BOOKMARKS BROWSER_ACTION TABS CHROME.BOOKMARKS.CREATE CHROME.BOOKMARKS.GET CHROME.BOOKMARKS.GETTREE CHROME.BOOKMARKS.REMOVE CHROME.BOOKMARKS.UPDATE CHROME.TABS.CREATE",
       "source_files": [
         "manifest.json",
-        "popup.html"
+        "popup.html",
+        "popup.js"
       ],
-      "source_hash": "825556bebc0df5d0ff8980f1c6ff86fdf748e03f",
+      "source_hash": "36384c77578ceb55b1ce76f777451880fdf32b9d",
       "zip_path": "examples\/api\/bookmarks\/basic.zip"
     },
     {
@@ -1888,7 +1890,7 @@
         "background.js",
         "manifest.json"
       ],
-      "source_hash": "f8798dbb627b762b620d0e5dcffe049539fb9673",
+      "source_hash": "cf807f051cdf685d031b58cdb995ef7fabdda832",
       "zip_path": "examples\/api\/browserAction\/print.zip"
     },
     {
author	mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-01-25 15:27:12 +0000
committer	mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-01-25 15:27:12 +0000
commit	80b62eef8bad3345619934894244829e1c205dc4 (patch)
tree	33f9582e3ad273f14c188de51d683bedc121c4bc
parent	b2401b8e549e5d788fcee92a3b8c7d018f55aff1 (diff)
download	chromium_src-80b62eef8bad3345619934894244829e1c205dc4.zip chromium_src-80b62eef8bad3345619934894244829e1c205dc4.tar.gz chromium_src-80b62eef8bad3345619934894244829e1c205dc4.tar.bz2