summaryrefslogtreecommitdiffstats
path: root/content/browser/speech
diff options
context:
space:
mode:
authormilanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 11:18:43 +0000
committermilanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 11:18:43 +0000
commit1e96882c561f34f57e3001da7f157fd5def2082c (patch)
tree1e717a6ae87455c5bb712f7995c8022b1e74a857 /content/browser/speech
parentbd870c8c72941b7a5e8b2589336eb382bdb00935 (diff)
downloadchromium_src-1e96882c561f34f57e3001da7f157fd5def2082c.zip
chromium_src-1e96882c561f34f57e3001da7f157fd5def2082c.tar.gz
chromium_src-1e96882c561f34f57e3001da7f157fd5def2082c.tar.bz2
Remove speech recognition manager from iOS.
Speech recognition on iOS is moving to a new architecture. BUG=None Review URL: https://chromiumcodereview.appspot.com/16871007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech')
-rw-r--r--content/browser/speech/speech_recognition_manager_impl.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index ba7e8dc..dffd6f3 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -179,11 +179,6 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id,
if (!SessionExists(session_id))
return;
-#if defined(OS_IOS)
- // On iOS, voice search can only be initiated by clear user action and thus
- // it is always allowed.
- DCHECK(!ask_user && is_allowed);
-#else
if (ask_user) {
SessionsTable::iterator iter = sessions_.find(session_id);
DCHECK(iter != sessions_.end());
@@ -199,7 +194,6 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id,
weak_factory_.GetWeakPtr(), session_id));
return;
}
-#endif // defined(OS_IOS)
if (is_allowed) {
base::MessageLoop::current()->PostTask(