content/browser/speech/speech_recognition_manager_impl.h - Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/speech/speech_recognition_manager_impl.h

Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanups Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/speech/speech_recognition_dispatcher_host.cc ('K') | « content/browser/speech/speech_recognition_dispatcher_host.cc ('k') | content/browser/speech/speech_recognition_manager_impl.cc » ('j') | content/public/browser/speech_recognition_session_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_recognition_manager_impl.h

diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h

index 9b8da39fc47af4cb977ede096ff2d963f2ccc8d3..57b199f91409aa02fb60279124f6913bead4b511 100644

--- a/content/browser/speech/speech_recognition_manager_impl.h

+++ b/content/browser/speech/speech_recognition_manager_impl.h

@@ -61,16 +61,14 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :

int CreateSession(const SpeechRecognitionSessionConfig& config) override;

void StartSession(int session_id) override;

void AbortSession(int session_id) override;

- void AbortAllSessionsForRenderProcess(int render_process_id) override;

- void AbortAllSessionsForRenderView(int render_process_id,

- int render_view_id) override;

+ void AbortAllSessionsForRenderFrame(

+ RenderFrameHost* render_frame_host) override;

void StopAudioCaptureForSession(int session_id) override;

const SpeechRecognitionSessionConfig& GetSessionConfig(

int session_id) const override;

SpeechRecognitionSessionContext GetSessionContext(

int session_id) const override;

- int GetSession(int render_process_id,

- int render_view_id,

+ int GetSession(RenderFrameHost* render_frame_host,

int request_id) const override;

bool HasAudioInputDevices() override;

base::string16 GetAudioInputDeviceModel() override;