Add a tray notification UI for speech input recording in the extension API.

chrome/browser/speech/speech_input_extension_manager.h

Index: chrome/browser/speech/speech_input_extension_manager.h
diff --git a/chrome/browser/extensions/speech_input/extension_speech_input_manager.h b/chrome/browser/speech/speech_input_extension_manager.h
similarity index 83%
rename from chrome/browser/extensions/speech_input/extension_speech_input_manager.h
rename to chrome/browser/speech/speech_input_extension_manager.h
index 1bda889cba91b9f7b9e0b1c4352c122db8952c64..d626c9471f9f843c1857f50ca7cf67a0f7c5ebc8 100644
--- a/chrome/browser/extensions/speech_input/extension_speech_input_manager.h
+++ b/chrome/browser/speech/speech_input_extension_manager.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_SPEECH_INPUT_EXTENSION_SPEECH_INPUT_MANAGER_H_
-#define CHROME_BROWSER_EXTENSIONS_SPEECH_INPUT_EXTENSION_SPEECH_INPUT_MANAGER_H_
+#ifndef CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
+#define CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #pragma once
 
-#include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/speech/speech_input_extension_notification_ui.h"
 #include "content/browser/speech/speech_recognizer.h"
 #include "content/common/speech_input_result.h"
 #include "content/public/browser/notification_observer.h"
@@ -22,10 +22,10 @@ class URLRequestContextGetter;
 }
 
 // Used for API tests.
-class ExtensionSpeechInterface {
+class SpeechExtensionInterface {

[Satish, 2011/11/07 18:16:31]

should be SpeechInputExtensionInterface ?

[Leandro Graciá Gil, 2011/11/07 19:34:42]

Done.

  public:
-  ExtensionSpeechInterface();
-  virtual ~ExtensionSpeechInterface();
+  SpeechExtensionInterface();
+  virtual ~SpeechExtensionInterface();
 
   // Called from the IO thread.
   virtual void StartRecording(
@@ -51,11 +51,11 @@ class ExtensionSpeechInterface {
 
 // Manages the speech input requests and responses from the extensions
 // associated to the given profile.
-class ExtensionSpeechInputManager
-    : public base::RefCountedThreadSafe<ExtensionSpeechInputManager>,
+class SpeechInputExtensionManager
+    : public base::RefCountedThreadSafe<SpeechInputExtensionManager>,
       public speech_input::SpeechRecognizerDelegate,
       public content::NotificationObserver,
-      private ExtensionSpeechInterface {
+      private SpeechExtensionInterface {
  public:
   enum State {
     kIdle = 0,
@@ -75,11 +75,11 @@ class ExtensionSpeechInputManager
   };
 
   // Should not be used directly. Managed by a ProfileKeyedServiceFactory.
-  explicit ExtensionSpeechInputManager(Profile* profile);
+  explicit SpeechInputExtensionManager(Profile* profile);
 
   // Returns the corresponding manager for the given profile, creating
   // a new one if required.
-  static ExtensionSpeechInputManager* GetForProfile(Profile* profile);
+  static SpeechInputExtensionManager* GetForProfile(Profile* profile);
 
   // Initialize the ProfileKeyedServiceFactory.
   static void InitializeFactory();
@@ -123,14 +123,14 @@ class ExtensionSpeechInputManager
                                  OVERRIDE;
   virtual void DidCompleteEnvironmentEstimation(int caller_id) OVERRIDE;
   virtual void SetInputVolume(int caller_id, float volume,
-                              float noise_volume) OVERRIDE {}
+                              float noise_volume) OVERRIDE;
 
   // Methods for API testing.
-  void SetExtensionSpeechInterface(ExtensionSpeechInterface* interface);
-  ExtensionSpeechInterface* GetExtensionSpeechInterface();
+  void SetSpeechExtensionInterface(SpeechExtensionInterface* interface);
+  SpeechExtensionInterface* GetSpeechExtensionInterface();
 
  private:
-  // ExtensionSpeechInterface methods:
+  // SpeechExtensionInterface methods:
   virtual bool IsRecordingInProcess() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
   virtual bool HasValidRecognizer() OVERRIDE;
@@ -165,11 +165,12 @@ class ExtensionSpeechInputManager
                                 const std::string& json_args);
   void ExtensionUnloaded(const std::string& extension_id);
 
+  void SetInputVolumeOnUIThread(float volume);
   void ResetToIdleState();
 
-  virtual ~ExtensionSpeechInputManager();
+  virtual ~SpeechInputExtensionManager();
 
-  friend class base::RefCountedThreadSafe<ExtensionSpeechInputManager>;
+  friend class base::RefCountedThreadSafe<SpeechInputExtensionManager>;
   class Factory;
 
   // Lock used to allow exclusive access to the state variable and methods that
@@ -187,7 +188,8 @@ class ExtensionSpeechInputManager
 
   // Used in the UI thread.
   content::NotificationRegistrar registrar_;
-  ExtensionSpeechInterface* speech_interface_;
+  SpeechExtensionInterface* speech_interface_;
+  SpeechInputExtensionNotificationUI notification_;
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_SPEECH_INPUT_EXTENSION_SPEECH_INPUT_MANAGER_H_
+#endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_