| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 98 |
| 99 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( | 99 ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry( |
| 100 JNIEnv* env, | 100 JNIEnv* env, |
| 101 const JavaParamRef<jobject>&, | 101 const JavaParamRef<jobject>&, |
| 102 int index) { | 102 int index) { |
| 103 const autofill::PasswordForm* form = | 103 const autofill::PasswordForm* form = |
| 104 password_manager_presenter_.GetPassword(index); | 104 password_manager_presenter_.GetPassword(index); |
| 105 if (!form) { | 105 if (!form) { |
| 106 return Java_PasswordUIView_createSavedPasswordEntry( | 106 return Java_PasswordUIView_createSavedPasswordEntry( |
| 107 env, ConvertUTF8ToJavaString(env, std::string()), | 107 env, ConvertUTF8ToJavaString(env, std::string()), |
| 108 ConvertUTF16ToJavaString(env, base::string16()), |
| 108 ConvertUTF16ToJavaString(env, base::string16())); | 109 ConvertUTF16ToJavaString(env, base::string16())); |
| 109 } | 110 } |
| 110 std::string human_readable_origin = GetDisplayOriginForSettings(*form); | 111 std::string human_readable_origin = GetDisplayOriginForSettings(*form); |
| 111 return Java_PasswordUIView_createSavedPasswordEntry( | 112 return Java_PasswordUIView_createSavedPasswordEntry( |
| 112 env, ConvertUTF8ToJavaString(env, human_readable_origin), | 113 env, ConvertUTF8ToJavaString(env, human_readable_origin), |
| 113 ConvertUTF16ToJavaString(env, form->username_value)); | 114 ConvertUTF16ToJavaString(env, form->username_value), |
| 115 ConvertUTF16ToJavaString(env, form->password_value)); |
| 114 } | 116 } |
| 115 | 117 |
| 116 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( | 118 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( |
| 117 JNIEnv* env, | 119 JNIEnv* env, |
| 118 const JavaParamRef<jobject>&, | 120 const JavaParamRef<jobject>&, |
| 119 int index) { | 121 int index) { |
| 120 const autofill::PasswordForm* form = | 122 const autofill::PasswordForm* form = |
| 121 password_manager_presenter_.GetPasswordException(index); | 123 password_manager_presenter_.GetPasswordException(index); |
| 122 if (!form) | 124 if (!form) |
| 123 return ConvertUTF8ToJavaString(env, std::string()); | 125 return ConvertUTF8ToJavaString(env, std::string()); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 148 | 150 |
| 149 // static | 151 // static |
| 150 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 152 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 151 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); | 153 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); |
| 152 return reinterpret_cast<intptr_t>(controller); | 154 return reinterpret_cast<intptr_t>(controller); |
| 153 } | 155 } |
| 154 | 156 |
| 155 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { | 157 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { |
| 156 return RegisterNativesImpl(env); | 158 return RegisterNativesImpl(env); |
| 157 } | 159 } |
| OLD | NEW |