diff options
7 files changed, 55 insertions, 41 deletions
diff --git a/chrome/common/extensions/docs/examples/api/speechInput/basic.zip b/chrome/common/extensions/docs/examples/api/speechInput/basic.zip Binary files differindex 8c30190..e782bd1 100644 --- a/chrome/common/extensions/docs/examples/api/speechInput/basic.zip +++ b/chrome/common/extensions/docs/examples/api/speechInput/basic.zip diff --git a/chrome/common/extensions/docs/examples/api/speechInput/basic/background.html b/chrome/common/extensions/docs/examples/api/speechInput/basic/background.html index 34e7151..713f0c3 100644 --- a/chrome/common/extensions/docs/examples/api/speechInput/basic/background.html +++ b/chrome/common/extensions/docs/examples/api/speechInput/basic/background.html @@ -1,40 +1,9 @@ +<!doctype html> <html> -<script> -function setStartIcon() { - chrome.browserAction.setIcon({ path: "start.png" }); -} - -function setStopIcon() { - chrome.browserAction.setIcon({ path: "stop.png" }); -} - -chrome.browserAction.onClicked.addListener(function(tab) { - chrome.experimental.speechInput.isRecording(function(recording) { - if (!recording) { - chrome.experimental.speechInput.start({}, function() { - if (chrome.extension.lastError) { - alert("Couldn't start speech input: " + chrome.extension.lastError.message); - setStartIcon(); - } else { - setStopIcon(); - } - }); - } else { - chrome.experimental.speechInput.stop(function() { - setStartIcon(); - }); - } - }); -}); - -chrome.experimental.speechInput.onError.addListener(function(error) { - alert("Speech input failed: " + error.code); - setStartIcon(); -}); - -chrome.experimental.speechInput.onResult.addListener(function(result) { - alert(result.hypotheses[0].utterance); - setStartIcon(); -}); -</script> + <head> + <title>Speech Input API Background Page</title> + </head> + <body> + <script src="background.js"></script> + </body> </html> diff --git a/chrome/common/extensions/docs/examples/api/speechInput/basic/background.js b/chrome/common/extensions/docs/examples/api/speechInput/basic/background.js new file mode 100644 index 0000000..3093b6c --- /dev/null +++ b/chrome/common/extensions/docs/examples/api/speechInput/basic/background.js @@ -0,0 +1,41 @@ +// 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. + +function setStartIcon() { + chrome.browserAction.setIcon({ path: "start.png" }); +} + +function setStopIcon() { + chrome.browserAction.setIcon({ path: "stop.png" }); +} + +chrome.browserAction.onClicked.addListener(function(tab) { + chrome.experimental.speechInput.isRecording(function(recording) { + if (!recording) { + chrome.experimental.speechInput.start({}, function() { + if (chrome.extension.lastError) { + alert("Couldn't start speech input: " + + chrome.extension.lastError.message); + setStartIcon(); + } else { + setStopIcon(); + } + }); + } else { + chrome.experimental.speechInput.stop(function() { + setStartIcon(); + }); + } + }); +}); + +chrome.experimental.speechInput.onError.addListener(function(error) { + alert("Speech input failed: " + error.code); + setStartIcon(); +}); + +chrome.experimental.speechInput.onResult.addListener(function(result) { + alert(result.hypotheses[0].utterance); + setStartIcon(); +}); diff --git a/chrome/common/extensions/docs/examples/api/speechInput/basic/manifest.json b/chrome/common/extensions/docs/examples/api/speechInput/basic/manifest.json index f9a321c..4cc1564 100644 --- a/chrome/common/extensions/docs/examples/api/speechInput/basic/manifest.json +++ b/chrome/common/extensions/docs/examples/api/speechInput/basic/manifest.json @@ -12,5 +12,6 @@ "permissions": [ "experimental" - ] + ], + "content_security_policy": "default-src 'self'" } diff --git a/chrome/common/extensions/docs/experimental.settings.html b/chrome/common/extensions/docs/experimental.settings.html index 81b7224..5e7e9d8 100644 --- a/chrome/common/extensions/docs/experimental.settings.html +++ b/chrome/common/extensions/docs/experimental.settings.html @@ -524,7 +524,7 @@ <dd class="todo" style="display: none; "> Undocumented. </dd> - <dd>Settings under the "local" namespace are local to each browser.</dd> + <dd>Settings under the "local" namespace are local to each machine.</dd> <dd style="display: none; "> This parameter was added in version <b><span></span></b>. diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index feca078..633d028 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -3927,6 +3927,8 @@ <li> <code><a target="_blank" href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/speechInput/basic/background.html?content-type=text/plain">background.html</a></code> </li><li> + <code><a target="_blank" href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/speechInput/basic/background.js?content-type=text/plain">background.js</a></code> + </li><li> <code><a target="_blank" href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/speechInput/basic/manifest.json?content-type=text/plain">manifest.json</a></code> </li> </ul> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index 649ba2e..de90eb7 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -2162,9 +2162,10 @@ "search_string": "SPEECH RECOGNIZER RECOGNIZES YOUR SPEECH AND TELLS YOU THE MOST LIKELY RESULT. BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXPERIMENTAL.SPEECHINPUT.ISRECORDING CHROME.EXPERIMENTAL.SPEECHINPUT.ONERROR CHROME.EXPERIMENTAL.SPEECHINPUT.ONRESULT CHROME.EXPERIMENTAL.SPEECHINPUT.START CHROME.EXPERIMENTAL.SPEECHINPUT.STOP", "source_files": [ "background.html", + "background.js", "manifest.json" ], - "source_hash": "b092b58c922e769c003eb83e6ef4a63557ddc7f2", + "source_hash": "a3e7e6d7c8fee17bd14a56b855d40bca0c10015d", "zip_path": "examples\/api\/speechInput\/basic.zip" }, { |