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 21 matching lines @@
                                 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.
   virtual void DidStartReceivingAudio(int caller_id);
   virtual void SetRecognitionResult(int caller_id,
                                     bool error,
-                                    const SpeechInputResultArray& result);
+                                    const SpeechInputResult& result);
   virtual void DidCompleteRecording(int caller_id);
   virtual void DidCompleteRecognition(int caller_id);
+  virtual void DidSpeechInputStart(int caller_id);

[Satish, 2011/10/04 20:36:33]

please use the new OVERRIDE annotation for all overridden virtual functions in
the files you touch in this CL. See
https://sites.google.com/a/chromium.org/dev/developers/coding-style?pli=1#Met...
and
http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thre...

[Leandro Graciá Gil, 2011/10/05 22:09:00]

Done.

+  virtual void DidSpeechInputStop(int caller_id);
+  virtual void OnRecording(int caller_id);
+
   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);
 
  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.
@@ skipping 62 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_