Applying changes to the existing speech input code to support the extension API.

content/browser/speech/speech_input_manager.cc

 // 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.
 
 #include "content/browser/speech/speech_input_manager.h"
 
 #include "content/browser/browser_thread.h"
 #include "content/browser/speech/speech_input_preferences.h"
 #include "media/audio/audio_manager.h"
 
@@ skipping 101 matching lines @@
     }
   }
 }
 
 void SpeechInputManager::StopRecording(int caller_id) {
   DCHECK(HasPendingRequest(caller_id));
   requests_[caller_id].recognizer->StopRecording();
 }
 
 void SpeechInputManager::SetRecognitionResult(
-    int caller_id, bool error, const SpeechInputResultArray& result) {
+    int caller_id, const SpeechInputResult& result) {
   DCHECK(HasPendingRequest(caller_id));
   GetDelegate(caller_id)->SetRecognitionResult(caller_id, result);
 }
 
 void SpeechInputManager::DidCompleteRecording(int caller_id) {
   DCHECK(recording_caller_id_ == caller_id);
   DCHECK(HasPendingRequest(caller_id));
   recording_caller_id_ = 0;
   GetDelegate(caller_id)->DidCompleteRecording(caller_id);
   ShowRecognizing(caller_id);
 }
 
 void SpeechInputManager::DidCompleteRecognition(int caller_id) {
   GetDelegate(caller_id)->DidCompleteRecognition(caller_id);
   requests_.erase(caller_id);
   DoClose(caller_id);
 }
 
+void SpeechInputManager::DidStartReceivingSpeech(int caller_id) {
+}
+
+void SpeechInputManager::DidStopReceivingSpeech(int caller_id) {
+}
+
 void SpeechInputManager::OnRecognizerError(
-    int caller_id, SpeechRecognizer::ErrorCode error) {
+    int caller_id, SpeechInputError error) {
   if (caller_id == recording_caller_id_)
     recording_caller_id_ = 0;
   requests_[caller_id].is_active = false;
   ShowRecognizerError(caller_id, error);
 }
 
 void SpeechInputManager::DidStartReceivingAudio(int caller_id) {
   DCHECK(HasPendingRequest(caller_id));
   DCHECK(recording_caller_id_ == caller_id);
   ShowRecording(caller_id);
@@ skipping 36 matching lines @@
 
 SpeechInputManager::SpeechInputRequest::SpeechInputRequest()
     : delegate(NULL),
       is_active(false) {
 }
 
 SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
 }
 
 }  // namespace speech_input