| 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/context_utils.h" | 9 #include "base/android/context_utils.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| 11 #include "base/memory/singleton.h" | 11 #include "base/memory/singleton.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "chrome/browser/speech/tts_controller.h" | 13 #include "chrome/browser/speech/tts_controller.h" |
| 14 #include "chrome/common/features.h" |
| 14 #include "jni/TtsPlatformImpl_jni.h" | 15 #include "jni/TtsPlatformImpl_jni.h" |
| 15 | 16 |
| 16 using base::android::AttachCurrentThread; | 17 using base::android::AttachCurrentThread; |
| 17 | 18 |
| 18 // static | 19 // static |
| 19 TtsPlatformImpl* TtsPlatformImpl::GetInstance() { | 20 TtsPlatformImpl* TtsPlatformImpl::GetInstance() { |
| 20 return TtsPlatformImplAndroid::GetInstance(); | 21 return TtsPlatformImplAndroid::GetInstance(); |
| 21 } | 22 } |
| 22 | 23 |
| 23 TtsPlatformImplAndroid::TtsPlatformImplAndroid() | 24 TtsPlatformImplAndroid::TtsPlatformImplAndroid() |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { | 139 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { |
| 139 return base::Singleton< | 140 return base::Singleton< |
| 140 TtsPlatformImplAndroid, | 141 TtsPlatformImplAndroid, |
| 141 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); | 142 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); |
| 142 } | 143 } |
| 143 | 144 |
| 144 // static | 145 // static |
| 145 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { | 146 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { |
| 146 return RegisterNativesImpl(env); | 147 return RegisterNativesImpl(env); |
| 147 } | 148 } |
| OLD | NEW |