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

Side by Side Diff: Source/modules/speech/SpeechRecognitionController.h

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 SpeechRecognitionController_h 27 #define SpeechRecognitionController_h
28 28
29 #include "core/page/Page.h" 29 #include "core/page/Page.h"
30 #include "modules/speech/SpeechRecognitionClient.h" 30 #include "modules/speech/SpeechRecognitionClient.h"
31 #include "wtf/PassOwnPtr.h" 31 #include "wtf/PassOwnPtr.h"
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, bool continuous, bool interimResults, unsigned long maxAlt ernatives, MediaStreamTrack* audioTrack)
43 { 43 {
44 m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives, audioTrack); 44 m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives, audioTrack);
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 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); } 54 virtual void trace(Visitor* visitor) override { 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
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechRecognitionAlternative.h ('k') | Source/modules/speech/SpeechRecognitionError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698