| Index: chrome/browser/speech/extension_speech_input_manager.h
|
| diff --git a/chrome/browser/extensions/speech_input/extension_speech_input_manager.h b/chrome/browser/speech/extension_speech_input_manager.h
|
| similarity index 93%
|
| rename from chrome/browser/extensions/speech_input/extension_speech_input_manager.h
|
| rename to chrome/browser/speech/extension_speech_input_manager.h
|
| index 1bda889cba91b9f7b9e0b1c4352c122db8952c64..5fa6a2fc25fffda98d2cc7c7738a83c361206a65 100644
|
| --- a/chrome/browser/extensions/speech_input/extension_speech_input_manager.h
|
| +++ b/chrome/browser/speech/extension_speech_input_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_EXTENSION_SPEECH_INPUT_MANAGER_H_
|
| +#define CHROME_BROWSER_SPEECH_EXTENSION_SPEECH_INPUT_MANAGER_H_
|
| #pragma once
|
|
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| +#include "chrome/browser/speech/extension_speech_input_notification_ui.h"
|
| #include "content/browser/speech/speech_recognizer.h"
|
| #include "content/common/speech_input_result.h"
|
| #include "content/public/browser/notification_observer.h"
|
| @@ -123,7 +123,7 @@ 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);
|
| @@ -165,6 +165,7 @@ class ExtensionSpeechInputManager
|
| const std::string& json_args);
|
| void ExtensionUnloaded(const std::string& extension_id);
|
|
|
| + void SetInputVolumeOnUIThread(float volume);
|
| void ResetToIdleState();
|
|
|
| virtual ~ExtensionSpeechInputManager();
|
| @@ -188,6 +189,7 @@ class ExtensionSpeechInputManager
|
| // Used in the UI thread.
|
| content::NotificationRegistrar registrar_;
|
| ExtensionSpeechInterface* speech_interface_;
|
| + ExtensionSpeechInputNotificationUI notification_;
|
| };
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_SPEECH_INPUT_EXTENSION_SPEECH_INPUT_MANAGER_H_
|
| +#endif // CHROME_BROWSER_SPEECH_EXTENSION_SPEECH_INPUT_MANAGER_H_
|
|
|