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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 return; | 128 return; |
129 | 129 |
130 TtsController::GetInstance()->OnTtsEvent( | 130 TtsController::GetInstance()->OnTtsEvent( |
131 utterance_id_, event_type, char_index, std::string()); | 131 utterance_id_, event_type, char_index, std::string()); |
132 utterance_id_ = 0; | 132 utterance_id_ = 0; |
133 utterance_.clear(); | 133 utterance_.clear(); |
134 } | 134 } |
135 | 135 |
136 // static | 136 // static |
137 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { | 137 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { |
138 return Singleton<TtsPlatformImplAndroid, | 138 return base::Singleton< |
139 LeakySingletonTraits<TtsPlatformImplAndroid> >::get(); | 139 TtsPlatformImplAndroid, |
| 140 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); |
140 } | 141 } |
141 | 142 |
142 // static | 143 // static |
143 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { | 144 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { |
144 return RegisterNativesImpl(env); | 145 return RegisterNativesImpl(env); |
145 } | 146 } |
OLD | NEW |