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

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
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 #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"
11 #include "base/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/speech/tts_controller.h" 12 #include "chrome/browser/speech/tts_controller.h"
13 #include "jni/TtsPlatformImpl_jni.h" 13 #include "jni/TtsPlatformImpl_jni.h"
14 14
15 using base::android::AttachCurrentThread; 15 using base::android::AttachCurrentThread;
16 16
17 // static 17 // static
18 TtsPlatformImpl* TtsPlatformImpl::GetInstance() { 18 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
19 return TtsPlatformImplAndroid::GetInstance(); 19 return TtsPlatformImplAndroid::GetInstance();
20 } 20 }
21 21
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 // static 140 // static
141 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { 141 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() {
142 return Singleton<TtsPlatformImplAndroid>::get(); 142 return Singleton<TtsPlatformImplAndroid>::get();
143 } 143 }
144 144
145 // static 145 // static
146 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { 146 bool TtsPlatformImplAndroid::Register(JNIEnv* env) {
147 return RegisterNativesImpl(env); 147 return RegisterNativesImpl(env);
148 } 148 }
OLDNEW
« no previous file with comments | « chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc ('k') | chrome/browser/speech/tts_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698