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

Side by Side Diff: public/web/WebSpeechRecognitionParams.h

Issue 1117383002: Changing serviceuri param to be url from string in Blink and tagging requests to speech recognizer Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removing the exception on invalid urls, adding chromium to client param of serviceURI, and changing… Created 5 years, 6 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 | « Source/web/SpeechRecognitionClientProxy.cpp ('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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef WebSpeechRecognitionParams_h 26 #ifndef WebSpeechRecognitionParams_h
27 #define WebSpeechRecognitionParams_h 27 #define WebSpeechRecognitionParams_h
28 28
29 #include "WebSpeechGrammar.h" 29 #include "WebSpeechGrammar.h"
30 #include "public/platform/WebMediaStreamTrack.h" 30 #include "public/platform/WebMediaStreamTrack.h"
31 #include "public/platform/WebSecurityOrigin.h" 31 #include "public/platform/WebSecurityOrigin.h"
32 #include "public/platform/WebString.h" 32 #include "public/platform/WebString.h"
33 #include "public/platform/WebURL.h"
33 #include "public/platform/WebVector.h" 34 #include "public/platform/WebVector.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 class WebSpeechGrammar; 38 class WebSpeechGrammar;
38 39
39 class WebSpeechRecognitionParams { 40 class WebSpeechRecognitionParams {
40 public: 41 public:
41 WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, cons t WebString& language, const WebString& serviceURI, bool continuous, bool interi mResults, unsigned long maxAlternatives, const WebMediaStreamTrack& audioTrack, const WebSecurityOrigin& origin) 42 WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, cons t WebString& language, const WebURL& serviceURI, bool continuous, bool interimRe sults, unsigned long maxAlternatives, const WebMediaStreamTrack& audioTrack, con st WebSecurityOrigin& origin)
42 : m_grammars(grammars) 43 : m_grammars(grammars)
43 , m_language(language) 44 , m_language(language)
44 , m_serviceURI(serviceURI) 45 , m_serviceURI(serviceURI)
45 , m_continuous(continuous) 46 , m_continuous(continuous)
46 , m_interimResults(interimResults) 47 , m_interimResults(interimResults)
47 , m_maxAlternatives(maxAlternatives) 48 , m_maxAlternatives(maxAlternatives)
48 , m_audioTrack(audioTrack) 49 , m_audioTrack(audioTrack)
49 , m_origin(origin) 50 , m_origin(origin)
50 { 51 {
51 } 52 }
52 53
53 const WebVector<WebSpeechGrammar>& grammars() const { return m_grammars; } 54 const WebVector<WebSpeechGrammar>& grammars() const { return m_grammars; }
54 const WebString& language() const { return m_language; } 55 const WebString& language() const { return m_language; }
55 const WebString& serviceURI() const { return m_serviceURI; } 56 const WebURL& serviceURI() const { return m_serviceURI; }
56 bool continuous() const { return m_continuous; } 57 bool continuous() const { return m_continuous; }
57 bool interimResults() const { return m_interimResults; } 58 bool interimResults() const { return m_interimResults; }
58 unsigned long maxAlternatives() const { return m_maxAlternatives; } 59 unsigned long maxAlternatives() const { return m_maxAlternatives; }
59 const WebMediaStreamTrack& audioTrack() const { return m_audioTrack; } 60 const WebMediaStreamTrack& audioTrack() const { return m_audioTrack; }
60 const WebSecurityOrigin& origin() const { return m_origin; } 61 const WebSecurityOrigin& origin() const { return m_origin; }
61 62
62 private: 63 private:
63 WebVector<WebSpeechGrammar> m_grammars; 64 WebVector<WebSpeechGrammar> m_grammars;
64 WebString m_language; 65 WebString m_language;
65 WebString m_serviceURI; 66 WebURL m_serviceURI;
66 bool m_continuous; 67 bool m_continuous;
67 bool m_interimResults; 68 bool m_interimResults;
68 unsigned long m_maxAlternatives; 69 unsigned long m_maxAlternatives;
69 WebMediaStreamTrack m_audioTrack; 70 WebMediaStreamTrack m_audioTrack;
70 WebSecurityOrigin m_origin; 71 WebSecurityOrigin m_origin;
71 }; 72 };
72 73
73 } // namespace blink 74 } // namespace blink
74 75
75 #endif // WebSpeechRecognitionParams_h 76 #endif // WebSpeechRecognitionParams_h
OLDNEW
« no previous file with comments | « Source/web/SpeechRecognitionClientProxy.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698