Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2981)

Unified Diff: chrome/browser/ui/app_list/speech_recognizer.cc

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
Index: chrome/browser/ui/app_list/speech_recognizer.cc
diff --git a/chrome/browser/ui/app_list/speech_recognizer.cc b/chrome/browser/ui/app_list/speech_recognizer.cc
index 4945b2ef2b2ebf7554186b00f7c3dff7ab8fcb0f..97a89d15af1be5e5f863da0f3995df7cb41705dd 100644
--- a/chrome/browser/ui/app_list/speech_recognizer.cc
+++ b/chrome/browser/ui/app_list/speech_recognizer.cc
@@ -43,7 +43,7 @@ class SpeechRecognizer::EventListener
net::URLRequestContextGetter* url_request_context_getter,
const std::string& locale);
- void StartOnIOThread(int render_process_id);
+ void StartOnIOThread(content::RenderFrameHost*);
void StopOnIOThread();
private:
@@ -104,7 +104,8 @@ SpeechRecognizer::EventListener::~EventListener() {
DCHECK(!speech_timeout_.IsRunning());
}
-void SpeechRecognizer::EventListener::StartOnIOThread(int render_process_id) {
+void SpeechRecognizer::EventListener::StartOnIOThread(
+ content::RenderFrameHost* render_frame_host) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
if (session_ != kInvalidSessionId)
StopOnIOThread();
@@ -118,7 +119,7 @@ void SpeechRecognizer::EventListener::StartOnIOThread(int render_process_id) {
config.filter_profanities = true;
config.url_request_context_getter = url_request_context_getter_;
config.event_listener = weak_factory_.GetWeakPtr();
- config.initial_context.render_process_id = render_process_id;
+ config.initial_context.render_frame_host = render_frame_host;
auto speech_instance = content::SpeechRecognitionManager::GetInstance();
session_ = speech_instance->CreateSession(config);
@@ -276,7 +277,7 @@ void SpeechRecognizer::Start() {
FROM_HERE,
base::Bind(&SpeechRecognizer::EventListener::StartOnIOThread,
speech_event_listener_,
- contents->GetRenderProcessHost()->GetID()));
+ contents->GetMainFrame()));
}
void SpeechRecognizer::Stop() {

Powered by Google App Engine
This is Rietveld 408576698