Refactoring of chrome speech recognition architecture (CL1.3)

chrome/browser/speech/speech_input_extension_manager.h

 // Copyright (c) 2012 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 CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 
 class Extension;
 class Profile;
 class SpeechInputExtensionNotification;
 
 namespace content {
 class NotificationRegistrar;
+struct SpeechRecognitionError;
+struct SpeechRecognitionResult;
 class SpeechRecognizer;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // Used for API tests.
 class SpeechInputExtensionInterface {
  public:
@@ skipping 83 matching lines @@
   // Methods from SpeechRecognitionEventListener.
   virtual void OnRecognitionStart(int caller_id) OVERRIDE;
   virtual void OnAudioStart(int caller_id) OVERRIDE;
   virtual void OnEnvironmentEstimationComplete(int caller_id) OVERRIDE;
   virtual void OnSoundStart(int caller_id) OVERRIDE;
   virtual void OnSoundEnd(int caller_id) OVERRIDE;
   virtual void OnAudioEnd(int caller_id) OVERRIDE;
   virtual void OnRecognitionResult(
       int caller_id, const content::SpeechRecognitionResult& result) OVERRIDE;
   virtual void OnRecognitionError(
-      int caller_id,
-      const content::SpeechRecognitionErrorCode& error) OVERRIDE;
+      int caller_id, const content::SpeechRecognitionError& error) OVERRIDE;
   virtual void OnAudioLevelsChange(int caller_id, float volume,
                                    float noise_volume) OVERRIDE;
   virtual void OnRecognitionEnd(int caller_id) OVERRIDE;
 
   // Methods for API testing.
   void SetSpeechInputExtensionInterface(
       SpeechInputExtensionInterface* interface);
   SpeechInputExtensionInterface* GetSpeechInputExtensionInterface();
 
  private:
@@ skipping 57 matching lines @@
   // Used in the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
   SpeechInputExtensionInterface* speech_interface_;
   scoped_ptr<SpeechInputExtensionNotification> notification_;
 
   // Used in the IO thread.
   scoped_refptr<content::SpeechRecognizer> recognizer_;
 };
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_