diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 22:03:35 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 22:03:35 +0000 |
| commit | c4989d9500805d7a086c904f66b4f45b0e31a0e5 (patch) | |
| tree | 4befd4790a3bec8281b4590eb6161580418474c0 | |
| parent | cf5115ee974469cf92628598e71e65b70fab4e4d (diff) | |
| download | chromium_src-c4989d9500805d7a086c904f66b4f45b0e31a0e5.zip chromium_src-c4989d9500805d7a086c904f66b4f45b0e31a0e5.tar.gz chromium_src-c4989d9500805d7a086c904f66b4f45b0e31a0e5.tar.bz2 | |
Updating six sample extensions to manifest version 2.
* extensions/ttsdemo
* extensions/talking_alarm_clock
* extensions/speak_selection
* extensions/oauth_contacts
* extensions/maps_app
* extensions/irc/app
BUG=111049
TEST=
Review URL: https://chromiumcodereview.appspot.com/9290014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119128 0039d316-1c4b-4281-b951-d872f2087c98
22 files changed, 178 insertions, 156 deletions
diff --git a/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json b/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json index ec0d787..9c6b31e 100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json @@ -6,5 +6,6 @@ "url": "http://localhost:8080" }, "origins": ["http://localhost:8080"] - } -}
\ No newline at end of file + }, + "manifest_version": 2 +} diff --git a/chrome/common/extensions/docs/examples/extensions/maps_app/manifest.json b/chrome/common/extensions/docs/examples/extensions/maps_app/manifest.json index 1d600ee..bb1f2e8 100644 --- a/chrome/common/extensions/docs/examples/extensions/maps_app/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/maps_app/manifest.json @@ -10,5 +10,6 @@ "web_url": "http://maps.google.com/" } }, - "permissions": ["geolocation"] + "permissions": ["geolocation"], + "manifest_version": 2 } diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts.zip b/chrome/common/extensions/docs/examples/extensions/oauth_contacts.zip Binary files differindex 6600a83..e519e1b 100644 --- a/chrome/common/extensions/docs/examples/extensions/oauth_contacts.zip +++ b/chrome/common/extensions/docs/examples/extensions/oauth_contacts.zip diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.html b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.html deleted file mode 100644 index b63a6e6..0000000 --- a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.html +++ /dev/null @@ -1,84 +0,0 @@ -<!DOCTYPE html> -<!-- - * Copyright (c) 2009 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. ---> -<html> - <head> - <script type="text/javascript" src="chrome_ex_oauthsimple.js"></script> - <script type="text/javascript" src="chrome_ex_oauth.js"></script> - <script type="text/javascript"> - var oauth = ChromeExOAuth.initBackgroundPage({ - 'request_url' : 'https://www.google.com/accounts/OAuthGetRequestToken', - 'authorize_url' : 'https://www.google.com/accounts/OAuthAuthorizeToken', - 'access_url' : 'https://www.google.com/accounts/OAuthGetAccessToken', - 'consumer_key' : 'anonymous', - 'consumer_secret' : 'anonymous', - 'scope' : 'http://www.google.com/m8/feeds/', - 'app_name' : 'Sample - OAuth Contacts' - }); - - var contacts = null; - - function setIcon() { - if (oauth.hasToken()) { - chrome.browserAction.setIcon({ 'path' : 'img/icon-19-on.png'}); - } else { - chrome.browserAction.setIcon({ 'path' : 'img/icon-19-off.png'}); - } - }; - - function onContacts(text, xhr) { - contacts = []; - var data = JSON.parse(text); - for (var i = 0, entry; entry = data.feed.entry[i]; i++) { - var contact = { - 'name' : entry['title']['$t'], - 'id' : entry['id']['$t'], - 'emails' : [] - }; - - if (entry['gd$email']) { - var emails = entry['gd$email']; - for (var j = 0, email; email = emails[j]; j++) { - contact['emails'].push(email['address']); - } - } - - if (!contact['name']) { - contact['name'] = contact['emails'][0] || "<Unknown>"; - } - contacts.push(contact); - } - - chrome.tabs.create({ 'url' : 'contacts.html'}); - }; - - function getContacts() { - oauth.authorize(function() { - console.log("on authorize"); - setIcon(); - var url = "http://www.google.com/m8/feeds/contacts/default/full"; - oauth.sendSignedRequest(url, onContacts, { - 'parameters' : { - 'alt' : 'json', - 'max-results' : 100 - } - }); - }); - }; - - function logout() { - oauth.clearTokens(); - setIcon(); - }; - - setIcon(); - chrome.browserAction.onClicked.addListener(getContacts); - - </script> - </head> - <body> - </body> -</html> diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.js b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.js new file mode 100644 index 0000000..2eef084 --- /dev/null +++ b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/background.js @@ -0,0 +1,71 @@ +// 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 oauth = ChromeExOAuth.initBackgroundPage({ + 'request_url' : 'https://www.google.com/accounts/OAuthGetRequestToken', + 'authorize_url' : 'https://www.google.com/accounts/OAuthAuthorizeToken', + 'access_url' : 'https://www.google.com/accounts/OAuthGetAccessToken', + 'consumer_key' : 'anonymous', + 'consumer_secret' : 'anonymous', + 'scope' : 'http://www.google.com/m8/feeds/', + 'app_name' : 'Sample - OAuth Contacts' +}); + +var contacts = null; + +function setIcon() { + if (oauth.hasToken()) { + chrome.browserAction.setIcon({ 'path' : 'img/icon-19-on.png'}); + } else { + chrome.browserAction.setIcon({ 'path' : 'img/icon-19-off.png'}); + } +}; + +function onContacts(text, xhr) { + contacts = []; + var data = JSON.parse(text); + for (var i = 0, entry; entry = data.feed.entry[i]; i++) { + var contact = { + 'name' : entry['title']['$t'], + 'id' : entry['id']['$t'], + 'emails' : [] + }; + + if (entry['gd$email']) { + var emails = entry['gd$email']; + for (var j = 0, email; email = emails[j]; j++) { + contact['emails'].push(email['address']); + } + } + + if (!contact['name']) { + contact['name'] = contact['emails'][0] || "<Unknown>"; + } + contacts.push(contact); + } + + chrome.tabs.create({ 'url' : 'contacts.html'}); +}; + +function getContacts() { + oauth.authorize(function() { + console.log("on authorize"); + setIcon(); + var url = "http://www.google.com/m8/feeds/contacts/default/full"; + oauth.sendSignedRequest(url, onContacts, { + 'parameters' : { + 'alt' : 'json', + 'max-results' : 100 + } + }); + }); +}; + +function logout() { + oauth.clearTokens(); + setIcon(); +}; + +setIcon(); +chrome.browserAction.onClicked.addListener(getContacts); diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.html b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.html index 3d69dc3..10f29e8 100644 --- a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.html +++ b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.html @@ -21,34 +21,9 @@ <h2>Listing the first 100 results of a standard query to <a href="http://code.google.com/apis/contacts/">Google's Contacts API</a></h2> - <button onclick="logout();">Click here to clear your OAuth token</button> + <button id="clear">Click here to clear your OAuth token</button> <div id="output"> </div> - <script type="text/javascript"> - var contacts = chrome.extension.getBackgroundPage().contacts; - var output = document.getElementById('output'); - for (var i = 0, contact; contact = contacts[i]; i++) { - var div = document.createElement('div'); - var pName = document.createElement('p'); - var ulEmails = document.createElement('ul'); - - pName.innerText = contact['name']; - div.appendChild(pName); - - for (var j = 0, email; email = contact['emails'][j]; j++) { - var liEmail = document.createElement('li'); - liEmail.innerText = email; - ulEmails.appendChild(liEmail); - } - - div.appendChild(ulEmails); - output.appendChild(div); - } - - function logout() { - chrome.extension.getBackgroundPage().logout(); - window.close(); - }; - </script> + <script src="contacts.js"></script> </body> </html> diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.js b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.js new file mode 100644 index 0000000..225cd9b --- /dev/null +++ b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/contacts.js @@ -0,0 +1,32 @@ +// 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 contacts = chrome.extension.getBackgroundPage().contacts; +var output = document.getElementById('output'); +for (var i = 0, contact; contact = contacts[i]; i++) { + var div = document.createElement('div'); + var pName = document.createElement('p'); + var ulEmails = document.createElement('ul'); + + pName.innerText = contact['name']; + div.appendChild(pName); + + for (var j = 0, email; email = contact['emails'][j]; j++) { + var liEmail = document.createElement('li'); + liEmail.innerText = email; + ulEmails.appendChild(liEmail); + } + + div.appendChild(ulEmails); + output.appendChild(div); +} + +function logout() { + chrome.extension.getBackgroundPage().logout(); + window.close(); +} + +document.addEventListener('DOMContentLoaded', function () { + document.querySelector('#clear').addEventListener('click', logout); +}); diff --git a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/manifest.json b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/manifest.json index 84d6d86..5771b42 100644 --- a/chrome/common/extensions/docs/examples/extensions/oauth_contacts/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/oauth_contacts/manifest.json @@ -5,7 +5,11 @@ "128": "img/icon-128.png" }, "description": "Uses OAuth to connect to Google's contacts service and display a list of your contacts.", "background": { - "page": "background.html" + "scripts": [ + "chrome_ex_oauthsimple.js", + "chrome_ex_oauth.js", + "background.js" + ] }, "browser_action": { "default_title": "", @@ -17,5 +21,6 @@ "https://www.google.com/accounts/OAuthGetRequestToken", "https://www.google.com/accounts/OAuthAuthorizeToken", "https://www.google.com/accounts/OAuthGetAccessToken" - ] + ], + "manifest_version": 2 } diff --git a/chrome/common/extensions/docs/examples/extensions/speak_selection.zip b/chrome/common/extensions/docs/examples/extensions/speak_selection.zip Binary files differindex e39a8d1..3eeb0de 100644 --- a/chrome/common/extensions/docs/examples/extensions/speak_selection.zip +++ b/chrome/common/extensions/docs/examples/extensions/speak_selection.zip diff --git a/chrome/common/extensions/docs/examples/extensions/speak_selection/manifest.json b/chrome/common/extensions/docs/examples/extensions/speak_selection/manifest.json index 0c44cb0..fed3608 100644 --- a/chrome/common/extensions/docs/examples/extensions/speak_selection/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/speak_selection/manifest.json @@ -1,10 +1,20 @@ { "name": "Speak Selection", - "version": "1.0", + "version": "1.1", "description": "Speaks the current selection out loud.", - "permissions": [ "<all_urls>", "tts", "tabs" ], + "permissions": [ + "<all_urls>", + "tts", + "tabs" + ], - "background": { "scripts": ["background.js"] }, + "background": { + "scripts": [ + "keycodes.js", + "tabs.js", + "background.js" + ] + }, "browser_action": { "default_icon": "SpeakSel19.png", @@ -33,5 +43,7 @@ "48": "SpeakSel48.png", "128": "SpeakSel128.png", "256": "SpeakSel256.png" - } + }, + + "manifest_version": 2 } diff --git a/chrome/common/extensions/docs/examples/extensions/speak_selection/options.html b/chrome/common/extensions/docs/examples/extensions/speak_selection/options.html index 331c94f..f52ce7e 100644 --- a/chrome/common/extensions/docs/examples/extensions/speak_selection/options.html +++ b/chrome/common/extensions/docs/examples/extensions/speak_selection/options.html @@ -67,7 +67,7 @@ <script src="options.js"></script> <script src="content_script.js"></script> </head> -<body onload="load()"> +<body> <div class="banner"> <div class="banner_left"> diff --git a/chrome/common/extensions/docs/examples/extensions/speak_selection/options.js b/chrome/common/extensions/docs/examples/extensions/speak_selection/options.js index f251e37..f77e739 100644 --- a/chrome/common/extensions/docs/examples/extensions/speak_selection/options.js +++ b/chrome/common/extensions/docs/examples/extensions/speak_selection/options.js @@ -1,8 +1,6 @@ -/** - * 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. - */ +// 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 load() { var selectedElement = document.getElementById('selected'); @@ -128,3 +126,5 @@ function load() { return false; }, true); } + +document.addEventListener('DOMContentLoaded', load); diff --git a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip Binary files differindex d8d89dd..cccfe93f 100644 --- a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip +++ b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip diff --git a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/manifest.json b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/manifest.json index 9e81258..79f5b50 100644 --- a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/manifest.json @@ -17,5 +17,7 @@ "48": "clock-48.png", "128": "clock-128.png", "256": "clock-256.png" - } + }, + + "manifest_version": 2 } diff --git a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.html b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.html index 2d9a8a8..1619949 100644 --- a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.html +++ b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.html @@ -105,7 +105,7 @@ <script src="common.js"></script> <script src="popup.js"></script> </head> -<body onload="load()"> +<body> <div id="main"> diff --git a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.js b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.js index 3e81099..1f0bf06 100644 --- a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.js +++ b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock/popup.js @@ -1,8 +1,6 @@ -/** - * 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. - */ +// 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 blankClockImage; var blankClockAnim1Image; @@ -401,3 +399,5 @@ function load() { localStorage['voice'] = voiceArray[i].voiceName; }, false); } + +document.addEventListener('DOMContentLoaded', load); diff --git a/chrome/common/extensions/docs/examples/extensions/ttsdemo.zip b/chrome/common/extensions/docs/examples/extensions/ttsdemo.zip Binary files differindex e31f337..6d4280a 100644 --- a/chrome/common/extensions/docs/examples/extensions/ttsdemo.zip +++ b/chrome/common/extensions/docs/examples/extensions/ttsdemo.zip diff --git a/chrome/common/extensions/docs/examples/extensions/ttsdemo/manifest.json b/chrome/common/extensions/docs/examples/extensions/ttsdemo/manifest.json index a5ac1b0..ade1281 100644 --- a/chrome/common/extensions/docs/examples/extensions/ttsdemo/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/ttsdemo/manifest.json @@ -1,17 +1,19 @@ { - "app": { - "launch": { - "local_path": "ttsdemo.html" - } - }, - "description": "Demo Chrome's synthesized text-to-speech capabilities.", - "icons": { - "16": "16.png", - "128": "128.png", - "256": "256.png" - }, - "minimum_chrome_version": "14", - "name": "TTS Demo", - "permissions": [ "tts" ], - "version": "2.1" + "app": { + "launch": { + "local_path": "ttsdemo.html" + } + }, + "description": "Demo Chrome's synthesized text-to-speech capabilities.", + "icons": { + "16": "16.png", + "128": "128.png", + "256": "256.png" + }, + "minimum_chrome_version": "14", + "name": "TTS Demo", + "permissions": [ "tts" ], + "version": "2.1", + + "manifest_version": 2 } diff --git a/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.html b/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.html index 062959a..f05fae1 100644 --- a/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.html +++ b/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.html @@ -74,7 +74,7 @@ <script src="ttsdemo.js"></script> </head> -<body onload="load()"> +<body> <div class="banner"> <div class="banner_left"> diff --git a/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.js b/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.js index 82c62f3..d4e0a6f 100644 --- a/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.js +++ b/chrome/common/extensions/docs/examples/extensions/ttsdemo/ttsdemo.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011 The Chromium Authors. All rights reserved. + * 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. */ @@ -105,3 +105,5 @@ function speakUserText() { } speak(text.value, options, true); } + +document.addEventListener('DOMContentLoaded', load); diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index 75cf8c6..f26befe 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -3563,7 +3563,7 @@ <div class="sourcefiles"><strong>Source files:</strong> <ul> <li> - <code><a target="_blank" href="examples/extensions/oauth_contacts/background.html">background.html</a></code> + <code><a target="_blank" href="examples/extensions/oauth_contacts/background.js">background.js</a></code> </li><li> <code><a target="_blank" href="examples/extensions/oauth_contacts/chrome_ex_oauth.html">chrome_ex_oauth.html</a></code> </li><li> @@ -3573,6 +3573,8 @@ </li><li> <code><a target="_blank" href="examples/extensions/oauth_contacts/contacts.html">contacts.html</a></code> </li><li> + <code><a target="_blank" href="examples/extensions/oauth_contacts/contacts.js">contacts.js</a></code> + </li><li> <code><a target="_blank" href="examples/extensions/oauth_contacts/manifest.json">manifest.json</a></code> </li> </ul> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index c4337a5..ed2a1f9 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -1992,14 +1992,15 @@ ], "search_string": "SAMPLE - OAUTH CONTACTS USES OAUTH TO CONNECT TO GOOGLES CONTACTS SERVICE AND DISPLAY A LIST OF YOUR CONTACTS. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE", "source_files": [ - "background.html", + "background.js", "chrome_ex_oauth.html", "chrome_ex_oauth.js", "chrome_ex_oauthsimple.js", "contacts.html", + "contacts.js", "manifest.json" ], - "source_hash": "af4eb19fda4ff762a672a3440ee86c7a25a7e415", + "source_hash": "760ff59a48b7f758e9a80a6485cc0eb0c092841a", "zip_path": "examples\/extensions\/oauth_contacts.zip" }, { @@ -2107,7 +2108,7 @@ "options.js", "tabs.js" ], - "source_hash": "e80bd52801f710b5706027ade51519216e8031d5", + "source_hash": "9ef5dd34467a74abe48382348ec1ecde65466fd1", "zip_path": "examples\/extensions\/speak_selection.zip" }, { @@ -2256,7 +2257,7 @@ "popup.html", "popup.js" ], - "source_hash": "a35cba913444d2e1fd1b97653ed0ce72e20b678a", + "source_hash": "d5b5b987c7ea37bd7ec1fe7048ff58b4aef2e99d", "zip_path": "examples\/extensions\/talking_alarm_clock.zip" }, { @@ -2377,7 +2378,7 @@ "ttsdemo.html", "ttsdemo.js" ], - "source_hash": "c848fa77d649be391e365b3ce6f003a18bdbc7a7", + "source_hash": "a72820a4ac8dce453ae31ae39153f0ac19f75078", "zip_path": "examples\/extensions\/ttsdemo.zip" }, { |