diff options
author | dcheng <dcheng@chromium.org> | 2015-02-04 12:03:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-04 20:04:05 +0000 |
commit | 48d97c5da05500312e7262d32ffd42b3fbb1c38e (patch) | |
tree | 4ba2ae3059af46bcd080a4d2306b09b38fbb22c5 /content/browser/speech | |
parent | 6aefe981db1a5ed49a616fef03facbad024d748d (diff) | |
download | chromium_src-48d97c5da05500312e7262d32ffd42b3fbb1c38e.zip chromium_src-48d97c5da05500312e7262d32ffd42b3fbb1c38e.tar.gz chromium_src-48d97c5da05500312e7262d32ffd42b3fbb1c38e.tar.bz2 |
Update {virtual,override,final} to follow C++11 style.
The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.
This patch was automatically generated with an OS=android build using a
variation of https://codereview.chromium.org/598073004.
BUG=417463
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/884103004
Cr-Commit-Position: refs/heads/master@{#314610}
Diffstat (limited to 'content/browser/speech')
-rw-r--r-- | content/browser/speech/speech_recognizer_impl_android.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/speech/speech_recognizer_impl_android.h b/content/browser/speech/speech_recognizer_impl_android.h index cdf0b4d..11895c4 100644 --- a/content/browser/speech/speech_recognizer_impl_android.h +++ b/content/browser/speech/speech_recognizer_impl_android.h @@ -24,11 +24,11 @@ class CONTENT_EXPORT SpeechRecognizerImplAndroid : public SpeechRecognizer { int session_id); // SpeechRecognizer methods. - virtual void StartRecognition(const std::string& device_id) override; - virtual void AbortRecognition() override; - virtual void StopAudioCapture() override; - virtual bool IsActive() const override; - virtual bool IsCapturingAudio() const override; + void StartRecognition(const std::string& device_id) override; + void AbortRecognition() override; + void StopAudioCapture() override; + bool IsActive() const override; + bool IsCapturingAudio() const override; // Called from Java methods via JNI. void OnAudioStart(JNIEnv* env, jobject obj); @@ -53,7 +53,7 @@ class CONTENT_EXPORT SpeechRecognizerImplAndroid : public SpeechRecognizer { std::string language, bool continuous, bool interim_results); void OnRecognitionResultsOnIOThread(SpeechRecognitionResults const &results); - virtual ~SpeechRecognizerImplAndroid(); + ~SpeechRecognizerImplAndroid() override; base::android::ScopedJavaGlobalRef<jobject> j_recognition_; State state_; |