OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/speech/speech_input_dispatcher_host.h" | 5 #include "chrome/browser/speech/speech_input_dispatcher_host.h" |
6 | 6 |
7 #include "base/singleton.h" | 7 #include "base/singleton.h" |
8 #include "chrome/browser/renderer_host/render_process_host.h" | 8 #include "chrome/browser/renderer_host/render_process_host.h" |
9 #include "chrome/browser/renderer_host/render_view_host.h" | 9 #include "chrome/browser/renderer_host/render_view_host.h" |
10 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" | 10 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 OnStopRecording) | 134 OnStopRecording) |
135 IPC_MESSAGE_UNHANDLED(handled = false) | 135 IPC_MESSAGE_UNHANDLED(handled = false) |
136 IPC_END_MESSAGE_MAP() | 136 IPC_END_MESSAGE_MAP() |
137 return handled; | 137 return handled; |
138 } | 138 } |
139 | 139 |
140 void SpeechInputDispatcherHost::OnStartRecognition( | 140 void SpeechInputDispatcherHost::OnStartRecognition( |
141 int render_view_id, | 141 int render_view_id, |
142 int request_id, | 142 int request_id, |
143 const gfx::Rect& element_rect, | 143 const gfx::Rect& element_rect, |
| 144 const std::string& language, |
144 const std::string& grammar) { | 145 const std::string& grammar) { |
145 int caller_id = callers_->CreateId(resource_message_filter_process_id_, | 146 int caller_id = callers_->CreateId(resource_message_filter_process_id_, |
146 render_view_id, request_id); | 147 render_view_id, request_id); |
147 manager()->StartRecognition(this, caller_id, | 148 manager()->StartRecognition(this, caller_id, |
148 resource_message_filter_process_id_, | 149 resource_message_filter_process_id_, |
149 render_view_id, element_rect, grammar); | 150 render_view_id, element_rect, |
| 151 language, grammar); |
150 } | 152 } |
151 | 153 |
152 void SpeechInputDispatcherHost::OnCancelRecognition(int render_view_id, | 154 void SpeechInputDispatcherHost::OnCancelRecognition(int render_view_id, |
153 int request_id) { | 155 int request_id) { |
154 int caller_id = callers_->GetId(resource_message_filter_process_id_, | 156 int caller_id = callers_->GetId(resource_message_filter_process_id_, |
155 render_view_id, request_id); | 157 render_view_id, request_id); |
156 if (caller_id) { | 158 if (caller_id) { |
157 manager()->CancelRecognition(caller_id); | 159 manager()->CancelRecognition(caller_id); |
158 callers_->RemoveId(caller_id); // Request sequence ended so remove mapping. | 160 callers_->RemoveId(caller_id); // Request sequence ended so remove mapping. |
159 } | 161 } |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 int caller_request_id = callers_->request_id(caller_id); | 209 int caller_request_id = callers_->request_id(caller_id); |
208 SendMessageToRenderView( | 210 SendMessageToRenderView( |
209 new ViewMsg_SpeechInput_RecognitionComplete(caller_render_view_id, | 211 new ViewMsg_SpeechInput_RecognitionComplete(caller_render_view_id, |
210 caller_request_id), | 212 caller_request_id), |
211 caller_render_view_id); | 213 caller_render_view_id); |
212 callers_->RemoveId(caller_id); // Request sequence ended, so remove mapping. | 214 callers_->RemoveId(caller_id); // Request sequence ended, so remove mapping. |
213 VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit"; | 215 VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit"; |
214 } | 216 } |
215 | 217 |
216 } // namespace speech_input | 218 } // namespace speech_input |
OLD | NEW |