| 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 a27ea8a728ba0b109a871f34b5315331eba3a04c..52e46314c13e6572eb2d757964a577ce4786a0e2 100644
|
| --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| @@ -15,6 +15,7 @@
|
| class SpeechRecognitionTrayIconController;
|
|
|
| namespace speech {
|
| +
|
| // This is Chrome's implementation of the SpeechRecognitionManagerDelegate
|
| // interface.
|
| class ChromeSpeechRecognitionManagerDelegate
|
| @@ -51,7 +52,7 @@ class ChromeSpeechRecognitionManagerDelegate
|
| std::string* hardware_info) OVERRIDE;
|
| virtual void CheckRecognitionIsAllowed(
|
| int session_id,
|
| - base::Callback<void(int session_id, bool is_allowed)> callback) OVERRIDE;
|
| + base::Callback<void(bool ask_user, bool is_allowed)> callback) OVERRIDE;
|
| virtual content::SpeechRecognitionEventListener* GetEventListener() OVERRIDE;
|
|
|
| private:
|
| @@ -70,10 +71,10 @@ class ChromeSpeechRecognitionManagerDelegate
|
| // Checks for VIEW_TYPE_TAB_CONTENTS host in the UI thread and notifies back
|
| // the result in the IO thread through |callback|.
|
| static void CheckRenderViewType(
|
| - int session_id,
|
| - base::Callback<void(int session_id, bool is_allowed)> callback,
|
| + base::Callback<void(bool ask_user, bool is_allowed)> callback,
|
| int render_process_id,
|
| - int render_view_id);
|
| + int render_view_id,
|
| + bool js_api);
|
|
|
| // Starts a new recognition session, using the config of the last one
|
| // (which is copied into |last_session_config_|). Used for "try again".
|
|
|