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

Side by Side Diff: chrome/browser/speech/tts_linux.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « chrome/browser/speech/tts_controller_unittest.cc ('k') | chrome/browser/speech/tts_mac.mm » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <math.h> 5 #include <math.h>
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
(...skipping 15 matching lines...) Expand all
26 26
27 struct SPDChromeVoice { 27 struct SPDChromeVoice {
28 std::string name; 28 std::string name;
29 std::string module; 29 std::string module;
30 }; 30 };
31 31
32 } // namespace 32 } // namespace
33 33
34 class TtsPlatformImplLinux : public TtsPlatformImpl { 34 class TtsPlatformImplLinux : public TtsPlatformImpl {
35 public: 35 public:
36 virtual bool PlatformImplAvailable() OVERRIDE; 36 virtual bool PlatformImplAvailable() override;
37 virtual bool Speak( 37 virtual bool Speak(
38 int utterance_id, 38 int utterance_id,
39 const std::string& utterance, 39 const std::string& utterance,
40 const std::string& lang, 40 const std::string& lang,
41 const VoiceData& voice, 41 const VoiceData& voice,
42 const UtteranceContinuousParameters& params) OVERRIDE; 42 const UtteranceContinuousParameters& params) override;
43 virtual bool StopSpeaking() OVERRIDE; 43 virtual bool StopSpeaking() override;
44 virtual void Pause() OVERRIDE; 44 virtual void Pause() override;
45 virtual void Resume() OVERRIDE; 45 virtual void Resume() override;
46 virtual bool IsSpeaking() OVERRIDE; 46 virtual bool IsSpeaking() override;
47 virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; 47 virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
48 48
49 void OnSpeechEvent(SPDNotificationType type); 49 void OnSpeechEvent(SPDNotificationType type);
50 50
51 // Get the single instance of this class. 51 // Get the single instance of this class.
52 static TtsPlatformImplLinux* GetInstance(); 52 static TtsPlatformImplLinux* GetInstance();
53 53
54 private: 54 private:
55 TtsPlatformImplLinux(); 55 TtsPlatformImplLinux();
56 virtual ~TtsPlatformImplLinux(); 56 virtual ~TtsPlatformImplLinux();
57 57
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 // static 343 // static
344 TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() { 344 TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() {
345 return Singleton<TtsPlatformImplLinux, 345 return Singleton<TtsPlatformImplLinux,
346 LeakySingletonTraits<TtsPlatformImplLinux> >::get(); 346 LeakySingletonTraits<TtsPlatformImplLinux> >::get();
347 } 347 }
348 348
349 // static 349 // static
350 TtsPlatformImpl* TtsPlatformImpl::GetInstance() { 350 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
351 return TtsPlatformImplLinux::GetInstance(); 351 return TtsPlatformImplLinux::GetInstance();
352 } 352 }
OLDNEW
« no previous file with comments | « chrome/browser/speech/tts_controller_unittest.cc ('k') | chrome/browser/speech/tts_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698