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

chrome/browser/speech/chrome_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 "chrome/browser/speech/chrome_speech_input_manager.h"
 
 #include <string>
 
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 130 matching lines @@
     int caller_id, float volume, float noise_volume) {
   bubble_controller_->SetBubbleInputVolume(caller_id, volume, noise_volume);
 }
 
 void ChromeSpeechInputManager::ShowNoMicError(int caller_id) {
   bubble_controller_->SetBubbleMessage(
       caller_id, l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_NO_MIC));
 }
 
 void ChromeSpeechInputManager::ShowRecognizerError(
-    int caller_id, SpeechRecognizer::ErrorCode error) {
+    int caller_id, SpeechInputError error) {
   struct ErrorMessageMapEntry {
-    SpeechRecognizer::ErrorCode error;
+    SpeechInputError error;
     int message_id;
   };
   ErrorMessageMapEntry error_message_map[] = {
     {
-      SpeechRecognizer::RECOGNIZER_ERROR_CAPTURE, IDS_SPEECH_INPUT_MIC_ERROR
+      kErrorAudio, IDS_SPEECH_INPUT_MIC_ERROR
     }, {
-      SpeechRecognizer::RECOGNIZER_ERROR_NO_SPEECH, IDS_SPEECH_INPUT_NO_SPEECH
+      kErrorNoSpeech, IDS_SPEECH_INPUT_NO_SPEECH
     }, {
-      SpeechRecognizer::RECOGNIZER_ERROR_NO_RESULTS, IDS_SPEECH_INPUT_NO_RESULTS
+      kErrorNoMatch, IDS_SPEECH_INPUT_NO_RESULTS
     }, {
-      SpeechRecognizer::RECOGNIZER_ERROR_NETWORK, IDS_SPEECH_INPUT_NET_ERROR
+      kErrorNetwork, IDS_SPEECH_INPUT_NET_ERROR
     }
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(error_message_map); ++i) {
     if (error_message_map[i].error == error) {
       bubble_controller_->SetBubbleMessage(
           caller_id,
           l10n_util::GetStringUTF16(error_message_map[i].message_id));
       return;
     }
   }
@@ skipping 20 matching lines @@
     StartRecognitionForRequest(caller_id);
   }
 }
 
 void ChromeSpeechInputManager::InfoBubbleFocusChanged(int caller_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   OnFocusChanged(caller_id);
 }
 
 }  // namespace speech_input