OLD | NEW |
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 #include "chrome/browser/speech/tts_android.h" | 5 #include "chrome/browser/speech/tts_android.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 return; | 129 return; |
130 | 130 |
131 TtsController::GetInstance()->OnTtsEvent( | 131 TtsController::GetInstance()->OnTtsEvent( |
132 utterance_id_, event_type, char_index, std::string()); | 132 utterance_id_, event_type, char_index, std::string()); |
133 utterance_id_ = 0; | 133 utterance_id_ = 0; |
134 utterance_.clear(); | 134 utterance_.clear(); |
135 } | 135 } |
136 | 136 |
137 // static | 137 // static |
138 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { | 138 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { |
139 return Singleton<TtsPlatformImplAndroid, | 139 return base::Singleton< |
140 LeakySingletonTraits<TtsPlatformImplAndroid> >::get(); | 140 TtsPlatformImplAndroid, |
| 141 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); |
141 } | 142 } |
142 | 143 |
143 // static | 144 // static |
144 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { | 145 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { |
145 return RegisterNativesImpl(env); | 146 return RegisterNativesImpl(env); |
146 } | 147 } |
OLD | NEW |