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

Side by Side Diff: net/base/net_string_util_icu_alternatives_android.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 10 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
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util_icu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "net/base/net_string_util_icu_alternatives_android.h" 5 #include "net/base/net_string_util_icu_alternatives_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_piece.h" 10 #include "base/strings/string_piece.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 base::android::ScopedJavaLocalRef<jstring> java_charset = 59 base::android::ScopedJavaLocalRef<jstring> java_charset =
60 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); 60 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset));
61 ScopedJavaLocalRef<jstring> java_result = 61 ScopedJavaLocalRef<jstring> java_result =
62 android::Java_NetStringUtil_convertToUnicodeWithSubstitutions( 62 android::Java_NetStringUtil_convertToUnicodeWithSubstitutions(
63 env, java_byte_buffer.obj(), java_charset.obj()); 63 env, java_byte_buffer.obj(), java_charset.obj());
64 return java_result; 64 return java_result;
65 } 65 }
66 66
67 } // namespace 67 } // namespace
68 68
69 const char* const kCharsetLatin1 = "ISO-8859-1"; 69 const char kCharsetLatin1[] = "ISO-8859-1";
70 70
71 bool ConvertToUtf8(const std::string& text, const char* charset, 71 bool ConvertToUtf8(const std::string& text, const char* charset,
72 std::string* output) { 72 std::string* output) {
73 output->clear(); 73 output->clear();
74 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset); 74 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset);
75 if (java_result.is_null()) 75 if (java_result.is_null())
76 return false; 76 return false;
77 *output = base::android::ConvertJavaStringToUTF8(java_result); 77 *output = base::android::ConvertJavaStringToUTF8(java_result);
78 return true; 78 return true;
79 } 79 }
(...skipping 29 matching lines...) Expand all
109 return false; 109 return false;
110 *output = base::android::ConvertJavaStringToUTF16(java_result); 110 *output = base::android::ConvertJavaStringToUTF16(java_result);
111 return true; 111 return true;
112 } 112 }
113 113
114 bool RegisterNetStringUtils(JNIEnv* env) { 114 bool RegisterNetStringUtils(JNIEnv* env) {
115 return android::RegisterNativesImpl(env); 115 return android::RegisterNativesImpl(env);
116 } 116 }
117 117
118 } // namespace net 118 } // namespace net
OLDNEW
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698