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

Side by Side Diff: chrome/common/render_messages_internal.h

Issue 4119004: Add ability to parse multiple recognition results and send them to WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move header to chrome/common and address review comments. Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/render_messages.cc ('k') | chrome/common/speech_input_result.h » ('j') | 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 // This header is meant to be included in multiple passes, hence no traditional 5 // This header is meant to be included in multiple passes, hence no traditional
6 // header guard. 6 // header guard.
7 // See ipc_message_macros.h for explanation of the macros and passes. 7 // See ipc_message_macros.h for explanation of the macros and passes.
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 14
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/nullable_string16.h" 16 #include "base/nullable_string16.h"
17 #include "base/platform_file.h" 17 #include "base/platform_file.h"
18 #include "base/sync_socket.h" 18 #include "base/sync_socket.h"
19 #include "chrome/common/content_settings.h" 19 #include "chrome/common/content_settings.h"
20 #include "chrome/common/geoposition.h" 20 #include "chrome/common/geoposition.h"
21 #include "chrome/common/nacl_types.h" 21 #include "chrome/common/nacl_types.h"
22 #include "chrome/common/notification_type.h" 22 #include "chrome/common/notification_type.h"
23 #include "chrome/common/page_zoom.h" 23 #include "chrome/common/page_zoom.h"
24 #include "chrome/common/speech_input_result.h"
24 #include "chrome/common/translate_errors.h" 25 #include "chrome/common/translate_errors.h"
25 #include "chrome/common/window_container_type.h" 26 #include "chrome/common/window_container_type.h"
26 #include "ipc/ipc_message_macros.h" 27 #include "ipc/ipc_message_macros.h"
27 #include "media/audio/audio_buffers_state.h" 28 #include "media/audio/audio_buffers_state.h"
28 #include "third_party/WebKit/WebKit/chromium/public/WebExceptionCode.h" 29 #include "third_party/WebKit/WebKit/chromium/public/WebExceptionCode.h"
29 30
30 #if defined(OS_POSIX) 31 #if defined(OS_POSIX)
31 #include "base/file_descriptor_posix.h" 32 #include "base/file_descriptor_posix.h"
32 #endif 33 #endif
33 34
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 IPC_MESSAGE_ROUTED1(ViewMsg_AccessibilityDoDefaultAction, 1051 IPC_MESSAGE_ROUTED1(ViewMsg_AccessibilityDoDefaultAction,
1051 int /* object id */) 1052 int /* object id */)
1052 1053
1053 // Tells the render view that a ViewHostMsg_AccessibilityNotifications 1054 // Tells the render view that a ViewHostMsg_AccessibilityNotifications
1054 // message was processed and it can send addition notifications. 1055 // message was processed and it can send addition notifications.
1055 IPC_MESSAGE_ROUTED0(ViewMsg_AccessibilityNotifications_ACK) 1056 IPC_MESSAGE_ROUTED0(ViewMsg_AccessibilityNotifications_ACK)
1056 1057
1057 // Relay a speech recognition result, either partial or final. 1058 // Relay a speech recognition result, either partial or final.
1058 IPC_MESSAGE_ROUTED2(ViewMsg_SpeechInput_SetRecognitionResult, 1059 IPC_MESSAGE_ROUTED2(ViewMsg_SpeechInput_SetRecognitionResult,
1059 int /* request id */, 1060 int /* request id */,
1060 string16 /* result */) 1061 speech_input::SpeechInputResultArray /* result */)
1061 1062
1062 // Indicate that speech recognizer has stopped recording and started 1063 // Indicate that speech recognizer has stopped recording and started
1063 // recognition. 1064 // recognition.
1064 IPC_MESSAGE_ROUTED1(ViewMsg_SpeechInput_RecordingComplete, 1065 IPC_MESSAGE_ROUTED1(ViewMsg_SpeechInput_RecordingComplete,
1065 int /* request id */) 1066 int /* request id */)
1066 1067
1067 // Indicate that speech recognizer has completed recognition. This will be 1068 // Indicate that speech recognizer has completed recognition. This will be
1068 // the last message sent in response to a 1069 // the last message sent in response to a
1069 // ViewHostMsg_SpeechInput_StartRecognition. 1070 // ViewHostMsg_SpeechInput_StartRecognition.
1070 IPC_MESSAGE_ROUTED1(ViewMsg_SpeechInput_RecognitionComplete, 1071 IPC_MESSAGE_ROUTED1(ViewMsg_SpeechInput_RecognitionComplete,
(...skipping 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after
3040 base::PlatformFileInfo, /* info */ 3041 base::PlatformFileInfo, /* info */
3041 base::PlatformFileError /* error_code */) 3042 base::PlatformFileError /* error_code */)
3042 3043
3043 // Get the directory's contents. 3044 // Get the directory's contents.
3044 IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_PepperGetDirContents, 3045 IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_PepperGetDirContents,
3045 FilePath /* path */, 3046 FilePath /* path */,
3046 PepperDirContents, /* contents */ 3047 PepperDirContents, /* contents */
3047 base::PlatformFileError /* error_code */) 3048 base::PlatformFileError /* error_code */)
3048 3049
3049 IPC_END_MESSAGES(ViewHost) 3050 IPC_END_MESSAGES(ViewHost)
OLDNEW
« no previous file with comments | « chrome/common/render_messages.cc ('k') | chrome/common/speech_input_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698