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

Side by Side Diff: android_webview/native/aw_resource.cc

Issue 639113004: [android_webview] Hardcode the default text encoding to UTF-8. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "android_webview/native/aw_resource.h" 5 #include "android_webview/native/aw_resource.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "jni/AwResource_jni.h" 9 #include "jni/AwResource_jni.h"
10 10
(...skipping 12 matching lines...) Expand all
23 return base::android::ConvertJavaStringToUTF8(content); 23 return base::android::ConvertJavaStringToUTF8(content);
24 } 24 }
25 25
26 std::string GetNoDomainPageContent() { 26 std::string GetNoDomainPageContent() {
27 JNIEnv* env = base::android::AttachCurrentThread(); 27 JNIEnv* env = base::android::AttachCurrentThread();
28 ScopedJavaLocalRef<jstring> content = 28 ScopedJavaLocalRef<jstring> content =
29 Java_AwResource_getNoDomainPageContent(env); 29 Java_AwResource_getNoDomainPageContent(env);
30 return base::android::ConvertJavaStringToUTF8(content); 30 return base::android::ConvertJavaStringToUTF8(content);
31 } 31 }
32 32
33 std::string GetDefaultTextEncoding() {
34 JNIEnv* env = base::android::AttachCurrentThread();
35 ScopedJavaLocalRef<jstring> encoding =
36 Java_AwResource_getDefaultTextEncoding(env);
37 return base::android::ConvertJavaStringToUTF8(encoding);
38 }
39
40 bool RegisterAwResource(JNIEnv* env) { 33 bool RegisterAwResource(JNIEnv* env) {
41 return RegisterNativesImpl(env); 34 return RegisterNativesImpl(env);
42 } 35 }
43 36
44 } // namespace AwResource 37 } // namespace AwResource
45 } // namespace android_webview 38 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698