Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 21 matching lines...) Expand all Loading... | |
| 32 | 32 |
| 33 namespace blink { | 33 namespace blink { |
| 34 | 34 |
| 35 class MediaStreamTrack; | 35 class MediaStreamTrack; |
| 36 | 36 |
| 37 class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFin alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { | 37 class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFin alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { |
| 38 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); | 38 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); |
| 39 public: | 39 public: |
| 40 virtual ~SpeechRecognitionController(); | 40 virtual ~SpeechRecognitionController(); |
| 41 | 41 |
| 42 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars , const String& lang, bool continuous, bool interimResults, unsigned long maxAlt ernatives, MediaStreamTrack* audioTrack) | 42 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars , const String& lang, const String& serviceURI, bool continuous, bool interimRes ults, unsigned long maxAlternatives, MediaStreamTrack* audioTrack) |
| 43 { | 43 { |
| 44 m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives, audioTrack); | 44 m_client->start(recognition, grammars, lang, serviceURI, continuous, inter imResults, maxAlternatives, audioTrack); |
|
sof
2015/04/23 18:52:45
Indentation (editor set up for 2, rather than 4? :
kirtia
2015/04/24 20:44:38
Done.
| |
| 45 } | 45 } |
| 46 | 46 |
| 47 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); } | 47 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); } |
| 48 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); } | 48 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); } |
| 49 | 49 |
| 50 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr <SpeechRecognitionClient>); | 50 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr <SpeechRecognitionClient>); |
| 51 static const char* supplementName(); | 51 static const char* supplementName(); |
| 52 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam e())); } | 52 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam e())); } |
| 53 | 53 |
| 54 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor); } | 54 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor); } |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>); | 57 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>); |
| 58 | 58 |
| 59 OwnPtr<SpeechRecognitionClient> m_client; | 59 OwnPtr<SpeechRecognitionClient> m_client; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 } // namespace blink | 62 } // namespace blink |
| 63 | 63 |
| 64 #endif // SpeechRecognitionController_h | 64 #endif // SpeechRecognitionController_h |
| OLD | NEW |