summaryrefslogtreecommitdiffstats
path: root/content/browser/speech/speech_recognition_manager_impl.h
diff options
context:
space:
mode:
authortommyw@chromium.org <tommyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 11:25:34 +0000
committertommyw@chromium.org <tommyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 11:25:34 +0000
commitcdcd34b7d659506cd6292ebc25c04cc881603522 (patch)
tree26b20992058bfa687d7c4a1267f66d565fbd0dbe /content/browser/speech/speech_recognition_manager_impl.h
parentf06645cd12d2a7d32035c2485393f642eef36929 (diff)
downloadchromium_src-cdcd34b7d659506cd6292ebc25c04cc881603522.zip
chromium_src-cdcd34b7d659506cd6292ebc25c04cc881603522.tar.gz
chromium_src-cdcd34b7d659506cd6292ebc25c04cc881603522.tar.bz2
Merge 252233 "Making sure that SpeechRecognitionDispatcherHost i..."
> Making sure that SpeechRecognitionDispatcherHost is not used after free > A test have been discovered that under certain conditions a use after > free can occur. > > BUG=339667 > > Review URL: https://codereview.chromium.org/170243005 TBR=inferno@chromium.org Review URL: https://codereview.chromium.org/179403003 git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@253132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognition_manager_impl.h')
-rw-r--r--content/browser/speech/speech_recognition_manager_impl.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h
index d471cf3..9a60e07 100644
--- a/content/browser/speech/speech_recognition_manager_impl.h
+++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -62,8 +62,7 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
const SpeechRecognitionSessionConfig& config) OVERRIDE;
virtual void StartSession(int session_id) OVERRIDE;
virtual void AbortSession(int session_id) OVERRIDE;
- virtual void AbortAllSessionsForListener(
- SpeechRecognitionEventListener* listener) OVERRIDE;
+ virtual void AbortAllSessionsForRenderProcess(int render_process_id) OVERRIDE;
virtual void AbortAllSessionsForRenderView(int render_process_id,
int render_view_id) OVERRIDE;
virtual void StopAudioCaptureForSession(int session_id) OVERRIDE;