OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/android/password_ui_view_android.h" | 5 #include "chrome/browser/android/password_ui_view_android.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( | 103 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( |
104 JNIEnv* env, | 104 JNIEnv* env, |
105 const JavaParamRef<jobject>&, | 105 const JavaParamRef<jobject>&, |
106 int index) { | 106 int index) { |
107 const autofill::PasswordForm* form = | 107 const autofill::PasswordForm* form = |
108 password_manager_presenter_.GetPassword(index); | 108 password_manager_presenter_.GetPassword(index); |
109 if (!form) { | 109 if (!form) { |
110 return Java_PasswordUIView_createSavedPasswordEntry( | 110 return Java_PasswordUIView_createSavedPasswordEntry( |
111 env, | 111 env, |
112 ConvertUTF8ToJavaString(env, std::string()).obj(), | 112 ConvertUTF8ToJavaString(env, std::string()).obj(), |
| 113 ConvertUTF16ToJavaString(env, base::string16()).obj(), |
113 ConvertUTF16ToJavaString(env, base::string16()).obj()); | 114 ConvertUTF16ToJavaString(env, base::string16()).obj()); |
114 } | 115 } |
115 std::string human_readable_origin = GetDisplayOriginForSettings(*form); | 116 std::string human_readable_origin = GetDisplayOriginForSettings(*form); |
116 return Java_PasswordUIView_createSavedPasswordEntry( | 117 return Java_PasswordUIView_createSavedPasswordEntry( |
117 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), | 118 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), |
118 ConvertUTF16ToJavaString(env, form->username_value).obj()); | 119 ConvertUTF16ToJavaString(env, form->username_value).obj(), |
| 120 ConvertUTF16ToJavaString(env, form->password_value).obj()); |
119 } | 121 } |
120 | 122 |
121 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( | 123 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( |
122 JNIEnv* env, | 124 JNIEnv* env, |
123 const JavaParamRef<jobject>&, | 125 const JavaParamRef<jobject>&, |
124 int index) { | 126 int index) { |
125 const autofill::PasswordForm* form = | 127 const autofill::PasswordForm* form = |
126 password_manager_presenter_.GetPasswordException(index); | 128 password_manager_presenter_.GetPasswordException(index); |
127 if (!form) | 129 if (!form) |
128 return ConvertUTF8ToJavaString(env, std::string()); | 130 return ConvertUTF8ToJavaString(env, std::string()); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 163 |
162 // static | 164 // static |
163 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 165 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
164 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); | 166 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); |
165 return reinterpret_cast<intptr_t>(controller); | 167 return reinterpret_cast<intptr_t>(controller); |
166 } | 168 } |
167 | 169 |
168 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { | 170 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { |
169 return RegisterNativesImpl(env); | 171 return RegisterNativesImpl(env); |
170 } | 172 } |
OLD | NEW |