| Index: chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| index 83018d2bc93b64495e113602aa25169d5de84afd..b806b9979f88cdc7a18636eac5b6415fac9c2bba 100644
|
| --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| @@ -20,32 +20,35 @@ class ChromeSpeechRecognitionManagerDelegate
|
| public content::SpeechRecognitionEventListener {
|
| public:
|
| ChromeSpeechRecognitionManagerDelegate();
|
| - virtual ~ChromeSpeechRecognitionManagerDelegate();
|
| + ~ChromeSpeechRecognitionManagerDelegate() override;
|
|
|
| protected:
|
| // SpeechRecognitionEventListener methods.
|
| - virtual void OnRecognitionStart(int session_id) override;
|
| - virtual void OnAudioStart(int session_id) override;
|
| - virtual void OnEnvironmentEstimationComplete(int session_id) override;
|
| - virtual void OnSoundStart(int session_id) override;
|
| - virtual void OnSoundEnd(int session_id) override;
|
| - virtual void OnAudioEnd(int session_id) override;
|
| - virtual void OnRecognitionEnd(int session_id) override;
|
| - virtual void OnRecognitionResults(
|
| - int session_id, const content::SpeechRecognitionResults& result) override;
|
| - virtual void OnRecognitionError(
|
| - int session_id, const content::SpeechRecognitionError& error) override;
|
| - virtual void OnAudioLevelsChange(int session_id, float volume,
|
| - float noise_volume) override;
|
| + void OnRecognitionStart(int session_id) override;
|
| + void OnAudioStart(int session_id) override;
|
| + void OnEnvironmentEstimationComplete(int session_id) override;
|
| + void OnSoundStart(int session_id) override;
|
| + void OnSoundEnd(int session_id) override;
|
| + void OnAudioEnd(int session_id) override;
|
| + void OnRecognitionEnd(int session_id) override;
|
| + void OnRecognitionResults(
|
| + int session_id,
|
| + const content::SpeechRecognitionResults& result) override;
|
| + void OnRecognitionError(
|
| + int session_id,
|
| + const content::SpeechRecognitionError& error) override;
|
| + void OnAudioLevelsChange(int session_id,
|
| + float volume,
|
| + float noise_volume) override;
|
|
|
| // SpeechRecognitionManagerDelegate methods.
|
| - virtual void GetDiagnosticInformation(bool* can_report_metrics,
|
| - std::string* hardware_info) override;
|
| - virtual void CheckRecognitionIsAllowed(
|
| + void GetDiagnosticInformation(bool* can_report_metrics,
|
| + std::string* hardware_info) override;
|
| + void CheckRecognitionIsAllowed(
|
| int session_id,
|
| base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
|
| - virtual content::SpeechRecognitionEventListener* GetEventListener() override;
|
| - virtual bool FilterProfanities(int render_process_id) override;
|
| + content::SpeechRecognitionEventListener* GetEventListener() override;
|
| + bool FilterProfanities(int render_process_id) override;
|
|
|
| // Callback called by |tab_watcher_| on the IO thread to signal tab closure.
|
| virtual void TabClosedCallback(int render_process_id, int render_view_id);
|
|
|