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

content/browser/speech/speech_input_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 11 matching lines @@
 // handles requests received from various render views and makes sure only one
 // of them can use speech recognition at a time. It also sends recognition
 // results and status events to the render views when required.
 class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
  public:
   // Implemented by the dispatcher host to relay events to the render views.
   class Delegate {
    public:
     virtual void SetRecognitionResult(
         int caller_id,
-        const SpeechInputResultArray& result) = 0;
+        const SpeechInputResult& result) = 0;
     virtual void DidCompleteRecording(int caller_id) = 0;
     virtual void DidCompleteRecognition(int caller_id) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   SpeechInputManager();
 
   // Invokes the platform provided microphone settings UI in a non-blocking way,
@@ skipping 17 matching lines @@
                                 const gfx::Rect& element_rect,
                                 const std::string& language,
                                 const std::string& grammar,
                                 const std::string& origin_url,
                                 net::URLRequestContextGetter* context_getter,
                                 SpeechInputPreferences* speech_input_prefs);
   virtual void CancelRecognition(int caller_id);
   virtual void CancelAllRequestsWithDelegate(Delegate* delegate);
   virtual void StopRecording(int caller_id);
 
-  // SpeechRecognizer::Delegate methods.
+  // SpeechRecognizerDelegate methods.
   virtual void DidStartReceivingAudio(int caller_id);

[Satish, 2011/10/06 09:09:06]

OVERRIDE

[Leandro Graciá Gil, 2011/10/06 18:26:25]

Done.

   virtual void SetRecognitionResult(int caller_id,
                                     bool error,
-                                    const SpeechInputResultArray& result);
-  virtual void DidCompleteRecording(int caller_id);
-  virtual void DidCompleteRecognition(int caller_id);
+                                    const SpeechInputResult& result) OVERRIDE;
+  virtual void DidCompleteRecording(int caller_id) OVERRIDE;
+  virtual void DidCompleteRecognition(int caller_id) OVERRIDE;
+  virtual void DidStartReceivingSpeech(int caller_id) OVERRIDE;
+  virtual void DidStopReceivingSpeech(int caller_id) OVERRIDE;
+
   virtual void OnRecognizerError(int caller_id,
-                                 SpeechRecognizer::ErrorCode error);
-  virtual void DidCompleteEnvironmentEstimation(int caller_id);
-  virtual void SetInputVolume(int caller_id, float volume, float noise_volume);
+                                 SpeechInputError error) OVERRIDE;
+  virtual void DidCompleteEnvironmentEstimation(int caller_id) OVERRIDE;
+  virtual void SetInputVolume(int caller_id, float volume,
+                              float noise_volume) OVERRIDE;
 
  protected:
   // The pure virtual methods are used for displaying the current state of
   // recognition and for fetching optional request information.
 
   // Get the optional request information if available.
   virtual void GetRequestInfo(bool* can_report_metrics,
                               std::string* request_info) = 0;
 
   // Called when recognition has been requested from point |element_rect_| on
@@ skipping 15 matching lines @@
   // Continuously updated with the current input volume.
   virtual void ShowInputVolume(int caller_id,
                                float volume,
                                float noise_volume) = 0;
 
   // Called when no microphone has been found.
   virtual void ShowNoMicError(int caller_id) = 0;
 
   // Called when there has been a error with the recognition.
   virtual void ShowRecognizerError(int caller_id,
-                                   SpeechRecognizer::ErrorCode error) = 0;
+                                   SpeechInputError error) = 0;
 
   // Called when recognition has ended or has been canceled.
   virtual void DoClose(int caller_id) = 0;
 
   // Cancels recognition for the specified caller if it is active.
   void OnFocusChanged(int caller_id);
 
   bool HasPendingRequest(int caller_id) const;
 
   // Starts/restarts recognition for an existing request.
@@ skipping 22 matching lines @@
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputManager::Delegate SpeechInputManagerDelegate;
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_