diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 21:58:21 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 21:58:21 +0000 |
| commit | 113891eb855d7e39fec98ef38b8fba5d047379d0 (patch) | |
| tree | dd09083b93b606c33648d1c41b5a74909b5ae8d7 /chrome/app | |
| parent | 3964e57729f597c270361d87cec3a67a9fbde4e6 (diff) | |
| download | chromium_src-113891eb855d7e39fec98ef38b8fba5d047379d0.zip chromium_src-113891eb855d7e39fec98ef38b8fba5d047379d0.tar.gz chromium_src-113891eb855d7e39fec98ef38b8fba5d047379d0.tar.bz2 | |
Fine tuned availability of hotword plugin.
This CL adds several changes:
- enables the JS handler to turn on and off the hotword recognizer
- adds a pref 'hotword.app_list_enabled' to customize the plugin usage
- synchronization logic, so if the user explicitly turns off
hotword.search_enabled, hotword.app_list_enabled goes off too
- extract the language check of HotwordService as a static method
and let StartPageHandler check it, because our hotword
"Ok, Google" is US-English only
BUG=341710, 341779
R=xiyuan@chromium.org, rlp@chromium.org, estade@chromium.org
TBR=samarth@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/158143002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromeos_strings.grdp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp index 33c5423..dc076e9 100644 --- a/chrome/app/chromeos_strings.grdp +++ b/chrome/app/chromeos_strings.grdp @@ -2451,6 +2451,9 @@ Press any key to continue exploring. <message name="IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION" desc="description label for verified access about premium contents"> Enable Verified Access </message> + <message name="IDS_OPTIONS_ENABLE_HOTWORD_APP_LIST" desc="description label for the checkbox to enable/disable hotword in the app list search"> + Enable "Ok, Google" to start a voice search in the app launcher. + </message> <message name="IDS_NETWORK_RECONNECT_TITLE" desc="In network menu, title of the reconnect button that allows user to retry connection on error."> Reconnect </message> |