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

Side by Side Diff: chrome/browser/speech/tts_android.h

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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_SPEECH_TTS_ANDROID_H_ 5 #ifndef CHROME_BROWSER_SPEECH_TTS_ANDROID_H_
6 #define CHROME_BROWSER_SPEECH_TTS_ANDROID_H_ 6 #define CHROME_BROWSER_SPEECH_TTS_ANDROID_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "chrome/browser/speech/tts_platform.h" 10 #include "chrome/browser/speech/tts_platform.h"
11 11
12 class TtsPlatformImplAndroid : public TtsPlatformImpl { 12 class TtsPlatformImplAndroid : public TtsPlatformImpl {
13 public: 13 public:
14 // TtsPlatformImpl implementation. 14 // TtsPlatformImpl implementation.
15 virtual bool PlatformImplAvailable() OVERRIDE; 15 virtual bool PlatformImplAvailable() override;
16 virtual bool Speak( 16 virtual bool Speak(
17 int utterance_id, 17 int utterance_id,
18 const std::string& utterance, 18 const std::string& utterance,
19 const std::string& lang, 19 const std::string& lang,
20 const VoiceData& voice, 20 const VoiceData& voice,
21 const UtteranceContinuousParameters& params) OVERRIDE; 21 const UtteranceContinuousParameters& params) override;
22 virtual bool StopSpeaking() OVERRIDE; 22 virtual bool StopSpeaking() override;
23 virtual void Pause() OVERRIDE; 23 virtual void Pause() override;
24 virtual void Resume() OVERRIDE; 24 virtual void Resume() override;
25 virtual bool IsSpeaking() OVERRIDE; 25 virtual bool IsSpeaking() override;
26 virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; 26 virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
27 27
28 // Methods called from Java via JNI. 28 // Methods called from Java via JNI.
29 void VoicesChanged(JNIEnv* env, jobject obj); 29 void VoicesChanged(JNIEnv* env, jobject obj);
30 void OnEndEvent(JNIEnv* env, jobject obj, jint utterance_id); 30 void OnEndEvent(JNIEnv* env, jobject obj, jint utterance_id);
31 void OnErrorEvent(JNIEnv* env, jobject obj, jint utterance_id); 31 void OnErrorEvent(JNIEnv* env, jobject obj, jint utterance_id);
32 void OnStartEvent(JNIEnv* env, jobject obj, jint utterance_id); 32 void OnStartEvent(JNIEnv* env, jobject obj, jint utterance_id);
33 33
34 // Static functions. 34 // Static functions.
35 static TtsPlatformImplAndroid* GetInstance(); 35 static TtsPlatformImplAndroid* GetInstance();
36 static bool Register(JNIEnv* env); 36 static bool Register(JNIEnv* env);
37 37
38 private: 38 private:
39 friend struct DefaultSingletonTraits<TtsPlatformImplAndroid>; 39 friend struct DefaultSingletonTraits<TtsPlatformImplAndroid>;
40 40
41 TtsPlatformImplAndroid(); 41 TtsPlatformImplAndroid();
42 virtual ~TtsPlatformImplAndroid(); 42 virtual ~TtsPlatformImplAndroid();
43 43
44 void SendFinalTtsEvent( 44 void SendFinalTtsEvent(
45 int utterance_id, TtsEventType event_type, int char_index); 45 int utterance_id, TtsEventType event_type, int char_index);
46 46
47 base::android::ScopedJavaGlobalRef<jobject> java_ref_; 47 base::android::ScopedJavaGlobalRef<jobject> java_ref_;
48 int utterance_id_; 48 int utterance_id_;
49 std::string utterance_; 49 std::string utterance_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplAndroid); 51 DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplAndroid);
52 }; 52 };
53 53
54 #endif // CHROME_BROWSER_SPEECH_TTS_ANDROID_H_ 54 #endif // CHROME_BROWSER_SPEECH_TTS_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/speech/extension_api/tts_extension_apitest.cc ('k') | chrome/browser/speech/tts_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698