SpeechInputExtensionManager now interface with SpeechRecognitionManagerDelegate

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/string16.h"

[hans, 2012/05/15 13:35:17]

sort order

[Primiano Tucci (use gerrit), 2012/05/16 10:16:00]

Done.

 #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 SpeechRecognitionTrayIconController;
 
 namespace content {
 class NotificationRegistrar;
 struct SpeechRecognitionError;
+class SpeechRecognitionManager;
 struct SpeechRecognitionResult;
-class SpeechRecognizer;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // Used for API tests.
 class SpeechInputExtensionInterface {
  public:
   SpeechInputExtensionInterface();
   virtual ~SpeechInputExtensionInterface();
 
   // Called from the IO thread.
   virtual void StartRecording(
       content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
-      int session_id,
+      const string16& extension_name,
       const std::string& language,
       const std::string& grammar,
-      bool filter_profanities) = 0;
+      bool filter_profanities,
+      bool show_notification) = 0;
 
   virtual void StopRecording(bool recognition_failed) = 0;
   virtual bool HasAudioInputDevices() = 0;
   virtual bool IsCapturingAudio() = 0;
 
   // Called from the UI thread.
   virtual bool HasValidRecognizer() = 0;
 };
 
 // Manages the speech input requests and responses from the extensions
@@ skipping 80 matching lines @@
   SpeechInputExtensionInterface* GetSpeechInputExtensionInterface();
 
  private:
   // SpeechInputExtensionInterface methods:
   virtual bool IsCapturingAudio() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
   virtual bool HasValidRecognizer() OVERRIDE;
   virtual void StartRecording(
       content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
-      int session_id,
+      const string16& extension_name,
       const std::string& language,
       const std::string& grammar,
-      bool filter_profanities) OVERRIDE;
+      bool filter_profanities,
+      bool show_notification) OVERRIDE;
 
   virtual void StopRecording(bool recognition_failed) OVERRIDE;
 
   // Internal methods.
   void StartOnIOThread(
-      net::URLRequestContextGetter* context_getter,
+      scoped_refptr<net::URLRequestContextGetter> context_getter,
+      const string16& extension_name,
       const std::string& language,
       const std::string& grammar,
-      bool filter_profanities);
+      bool filter_profanities,
+      bool show_notification);
   void ForceStopOnIOThread();
   void IsRecordingOnIOThread(const IsRecordingCallback& callback);
 
   void SetRecognitionResultOnUIThread(
       const content::SpeechRecognitionResult& result,
       const std::string& extension_id);
   void DidStartReceivingAudioOnUIThread();
   void StopSucceededOnUIThread();
   void IsRecordingOnUIThread(const IsRecordingCallback& callback, bool result);
 
   void DispatchError(const std::string& error, bool dispatch_event);
   void DispatchEventToExtension(const std::string& extension_id,
                                 const std::string& event,
                                 const std::string& json_args);
   void ExtensionUnloaded(const std::string& extension_id);
 
-  void SetInputVolumeOnUIThread(float volume);
   void ResetToIdleState();
 
   virtual ~SpeechInputExtensionManager();
 
   friend class base::RefCountedThreadSafe<SpeechInputExtensionManager>;
   class Factory;
 
   // Lock used to allow exclusive access to the state variable and methods that
   // either read or write on it. This is required since the speech code
   // operates in the IO thread while the extension code uses the UI thread.
   base::Lock state_lock_;
 
   // Used in the UI thread but also its raw value as notification
   // source in the IO thread, guarded by the state lock and value.
   Profile* profile_;
 
   // Used in both threads, guarded by the state lock.
   State state_;
   std::string extension_id_in_use_;
 
   // Used in the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
   SpeechInputExtensionInterface* speech_interface_;
-  scoped_refptr<SpeechRecognitionTrayIconController> notification_;
 
   // Used in the IO thread.
-  scoped_refptr<content::SpeechRecognizer> recognizer_;
+  bool is_recognition_in_progress_;
+  int speech_recognition_session_id_;
 };
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_