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

Side by Side Diff: Source/web/SpeechRecognitionClientProxy.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
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 16 matching lines...) Expand all
27 #define SpeechRecognitionClientProxy_h 27 #define SpeechRecognitionClientProxy_h
28 28
29 #include "modules/speech/SpeechRecognitionClient.h" 29 #include "modules/speech/SpeechRecognitionClient.h"
30 #include "public/web/WebSpeechRecognizerClient.h" 30 #include "public/web/WebSpeechRecognizerClient.h"
31 #include "wtf/Compiler.h" 31 #include "wtf/Compiler.h"
32 #include "wtf/PassOwnPtr.h" 32 #include "wtf/PassOwnPtr.h"
33 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class KURL;
37 class MediaStreamTrack; 38 class MediaStreamTrack;
38 class WebSpeechRecognizer; 39 class WebSpeechRecognizer;
39 class WebString; 40 class WebString;
40 41
41 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { 42 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient {
42 public: 43 public:
43 virtual ~SpeechRecognitionClientProxy(); 44 virtual ~SpeechRecognitionClientProxy();
44 45
45 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in 46 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in
46 // itself, but attempting to call start/stop/abort on it will crash. 47 // itself, but attempting to call start/stop/abort on it will crash.
47 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; 48 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ;
48 49
49 // SpeechRecognitionClient: 50 // SpeechRecognitionClient:
50 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, const String& serviceURI, bool continuous, bool interimResults, unsigne d long maxAlternatives, MediaStreamTrack*) override; 51 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, const KURL& serviceURI, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack*) override;
51 virtual void stop(SpeechRecognition*) override; 52 virtual void stop(SpeechRecognition*) override;
52 virtual void abort(SpeechRecognition*) override; 53 virtual void abort(SpeechRecognition*) override;
53 54
54 // WebSpeechRecognizerClient: 55 // WebSpeechRecognizerClient:
55 virtual void didStartAudio(const WebSpeechRecognitionHandle&) override; 56 virtual void didStartAudio(const WebSpeechRecognitionHandle&) override;
56 virtual void didStartSound(const WebSpeechRecognitionHandle&) override; 57 virtual void didStartSound(const WebSpeechRecognitionHandle&) override;
57 virtual void didEndSound(const WebSpeechRecognitionHandle&) override; 58 virtual void didEndSound(const WebSpeechRecognitionHandle&) override;
58 virtual void didEndAudio(const WebSpeechRecognitionHandle&) override; 59 virtual void didEndAudio(const WebSpeechRecognitionHandle&) override;
59 virtual void didReceiveResults(const WebSpeechRecognitionHandle&, const WebV ector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRec ognitionResult>& currentInterimResults) override; 60 virtual void didReceiveResults(const WebSpeechRecognitionHandle&, const WebV ector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRec ognitionResult>& currentInterimResults) override;
60 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) override; 61 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) override;
61 virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebStr ing& message, WebSpeechRecognizerClient::ErrorCode) override; 62 virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebStr ing& message, WebSpeechRecognizerClient::ErrorCode) override;
62 virtual void didStart(const WebSpeechRecognitionHandle&) override; 63 virtual void didStart(const WebSpeechRecognitionHandle&) override;
63 virtual void didEnd(const WebSpeechRecognitionHandle&) override; 64 virtual void didEnd(const WebSpeechRecognitionHandle&) override;
64 65
65 private: 66 private:
66 SpeechRecognitionClientProxy(WebSpeechRecognizer*); 67 SpeechRecognitionClientProxy(WebSpeechRecognizer*);
67 68
68 WebSpeechRecognizer* m_recognizer; 69 WebSpeechRecognizer* m_recognizer;
69 }; 70 };
70 71
71 }; // namespace blink 72 }; // namespace blink
72 73
73 #endif // SpeechRecognitionClientProxy_h 74 #endif // SpeechRecognitionClientProxy_h
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechRecognitionController.h ('k') | Source/web/SpeechRecognitionClientProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698