content/browser/speech/speech_recognizer_impl_android.cc - Issue 102593002: Convert string16 to base::string16 in content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/speech/speech_recognizer_impl_android.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/speech/speech_recognizer_impl_android.cc

diff --git a/content/browser/speech/speech_recognizer_impl_android.cc b/content/browser/speech/speech_recognizer_impl_android.cc

index c771cefba54c490a35a1594a410feefd20fee9cf..2e8c57e87b251dbf99ccc9c031e7338515feee38 100644

--- a/content/browser/speech/speech_recognizer_impl_android.cc

+++ b/content/browser/speech/speech_recognizer_impl_android.cc

@@ -146,7 +146,7 @@ void SpeechRecognizerImplAndroid::OnAudioEnd(JNIEnv* env, jobject obj) {

void SpeechRecognizerImplAndroid::OnRecognitionResults(JNIEnv* env, jobject obj,

jobjectArray strings, jfloatArray floats, jboolean provisional) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- std::vector<string16> options;

+ std::vector<base::string16> options;

AppendJavaStringArrayToStringVector(env, strings, &options);

std::vector<float> scores(options.size(), 0.0);

if (floats != NULL)