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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( | 104 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( |
105 JNIEnv* env, | 105 JNIEnv* env, |
106 const JavaParamRef<jobject>&, | 106 const JavaParamRef<jobject>&, |
107 int index) { | 107 int index) { |
108 const autofill::PasswordForm* form = | 108 const autofill::PasswordForm* form = |
109 password_manager_presenter_.GetPassword(index); | 109 password_manager_presenter_.GetPassword(index); |
110 if (!form) { | 110 if (!form) { |
111 return Java_PasswordUIView_createSavedPasswordEntry( | 111 return Java_PasswordUIView_createSavedPasswordEntry( |
112 env, | 112 env, |
113 ConvertUTF8ToJavaString(env, std::string()).obj(), | 113 ConvertUTF8ToJavaString(env, std::string()).obj(), |
| 114 ConvertUTF16ToJavaString(env, base::string16()).obj(), |
114 ConvertUTF16ToJavaString(env, base::string16()).obj()); | 115 ConvertUTF16ToJavaString(env, base::string16()).obj()); |
115 } | 116 } |
116 std::string human_readable_origin = GetDisplayOriginForSettings(*form); | 117 std::string human_readable_origin = GetDisplayOriginForSettings(*form); |
117 return Java_PasswordUIView_createSavedPasswordEntry( | 118 return Java_PasswordUIView_createSavedPasswordEntry( |
118 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), | 119 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), |
119 ConvertUTF16ToJavaString(env, form->username_value).obj()); | 120 ConvertUTF16ToJavaString(env, form->username_value).obj(), |
| 121 ConvertUTF16ToJavaString(env, form->password_value).obj()); |
120 } | 122 } |
121 | 123 |
122 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( | 124 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( |
123 JNIEnv* env, | 125 JNIEnv* env, |
124 const JavaParamRef<jobject>&, | 126 const JavaParamRef<jobject>&, |
125 int index) { | 127 int index) { |
126 const autofill::PasswordForm* form = | 128 const autofill::PasswordForm* form = |
127 password_manager_presenter_.GetPasswordException(index); | 129 password_manager_presenter_.GetPasswordException(index); |
128 if (!form) | 130 if (!form) |
129 return ConvertUTF8ToJavaString(env, std::string()); | 131 return ConvertUTF8ToJavaString(env, std::string()); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 | 164 |
163 // static | 165 // static |
164 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 166 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
165 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); | 167 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); |
166 return reinterpret_cast<intptr_t>(controller); | 168 return reinterpret_cast<intptr_t>(controller); |
167 } | 169 } |
168 | 170 |
169 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { | 171 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { |
170 return RegisterNativesImpl(env); | 172 return RegisterNativesImpl(env); |
171 } | 173 } |
OLD | NEW |