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

Side by Side Diff: chrome/renderer/speech_input_dispatcher.cc

Issue 3615005: Language tag for speech prepatch (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: test_shell changes reverted. Created 10 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « chrome/renderer/speech_input_dispatcher.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/renderer/speech_input_dispatcher.h" 5 #include "chrome/renderer/speech_input_dispatcher.h"
6 6
7 #include "chrome/renderer/render_view.h" 7 #include "chrome/renderer/render_view.h"
8 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
9 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" 8 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
10 #include "third_party/WebKit/WebKit/chromium/public/WebSpeechInputListener.h" 9 #include "third_party/WebKit/WebKit/chromium/public/WebSpeechInputListener.h"
11 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
11 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
12 #include "third_party/WebKit/WebKit/chromium/public/WebView.h" 12 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
13 13
14 using WebKit::WebFrame; 14 using WebKit::WebFrame;
15 15
16 SpeechInputDispatcher::SpeechInputDispatcher( 16 SpeechInputDispatcher::SpeechInputDispatcher(
17 RenderView* render_view, WebKit::WebSpeechInputListener* listener) 17 RenderView* render_view, WebKit::WebSpeechInputListener* listener)
18 : render_view_(render_view), 18 : render_view_(render_view),
19 listener_(listener) { 19 listener_(listener) {
20 } 20 }
21 21
22 bool SpeechInputDispatcher::OnMessageReceived(const IPC::Message& message) { 22 bool SpeechInputDispatcher::OnMessageReceived(const IPC::Message& message) {
23 bool handled = true; 23 bool handled = true;
24 IPC_BEGIN_MESSAGE_MAP(SpeechInputDispatcher, message) 24 IPC_BEGIN_MESSAGE_MAP(SpeechInputDispatcher, message)
25 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_SetRecognitionResult, 25 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_SetRecognitionResult,
26 OnSpeechRecognitionResult) 26 OnSpeechRecognitionResult)
27 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_RecordingComplete, 27 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_RecordingComplete,
28 OnSpeechRecordingComplete) 28 OnSpeechRecordingComplete)
29 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_RecognitionComplete, 29 IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_RecognitionComplete,
30 OnSpeechRecognitionComplete) 30 OnSpeechRecognitionComplete)
31 IPC_MESSAGE_UNHANDLED(handled = false) 31 IPC_MESSAGE_UNHANDLED(handled = false)
32 IPC_END_MESSAGE_MAP() 32 IPC_END_MESSAGE_MAP()
33 return handled; 33 return handled;
34 } 34 }
35 35
36 bool SpeechInputDispatcher::startRecognition( 36 bool SpeechInputDispatcher::startRecognition(
37 int request_id, const WebKit::WebString& language,
38 const WebKit::WebRect& element_rect) {
39 return startRecognition(request_id, element_rect);
40 }
41
42 bool SpeechInputDispatcher::startRecognition(
37 int request_id, const WebKit::WebRect& element_rect) { 43 int request_id, const WebKit::WebRect& element_rect) {
38 LOG(INFO) << "SpeechInputDispatcher::startRecognition enter"; 44 LOG(INFO) << "SpeechInputDispatcher::startRecognition enter";
39 gfx::Size scroll = render_view_->webview()->mainFrame()->scrollOffset(); 45 gfx::Size scroll = render_view_->webview()->mainFrame()->scrollOffset();
40 gfx::Rect rect = element_rect; 46 gfx::Rect rect = element_rect;
41 rect.Offset(-scroll.width(), -scroll.height()); 47 rect.Offset(-scroll.width(), -scroll.height());
42 render_view_->Send(new ViewHostMsg_SpeechInput_StartRecognition( 48 render_view_->Send(new ViewHostMsg_SpeechInput_StartRecognition(
43 render_view_->routing_id(), request_id, rect)); 49 render_view_->routing_id(), request_id, rect));
44 LOG(INFO) << "SpeechInputDispatcher::startRecognition exit"; 50 LOG(INFO) << "SpeechInputDispatcher::startRecognition exit";
45 return true; 51 return true;
46 } 52 }
(...skipping 23 matching lines...) Expand all
70 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecordingComplete enter"; 76 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecordingComplete enter";
71 listener_->didCompleteRecording(request_id); 77 listener_->didCompleteRecording(request_id);
72 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecordingComplete exit"; 78 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecordingComplete exit";
73 } 79 }
74 80
75 void SpeechInputDispatcher::OnSpeechRecognitionComplete(int request_id) { 81 void SpeechInputDispatcher::OnSpeechRecognitionComplete(int request_id) {
76 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecognitionComplete enter"; 82 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecognitionComplete enter";
77 listener_->didCompleteRecognition(request_id); 83 listener_->didCompleteRecognition(request_id);
78 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecognitionComplete exit"; 84 LOG(INFO) << "SpeechInputDispatcher::OnSpeechRecognitionComplete exit";
79 } 85 }
OLDNEW
« no previous file with comments | « chrome/renderer/speech_input_dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698