| 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> |
| 8 |
| 7 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 8 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
| 12 #include "base/strings/string_piece.h" |
| 10 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 11 #include "chrome/browser/sync/profile_sync_service_factory.h" | 14 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 15 #include "chrome/grit/generated_resources.h" |
| 12 #include "components/autofill/core/common/password_form.h" | 16 #include "components/autofill/core/common/password_form.h" |
| 13 #include "components/browser_sync/browser/profile_sync_service.h" | 17 #include "components/browser_sync/browser/profile_sync_service.h" |
| 14 #include "components/password_manager/core/browser/affiliation_utils.h" | 18 #include "components/password_manager/core/browser/affiliation_utils.h" |
| 15 #include "components/password_manager/core/browser/password_bubble_experiment.h" | 19 #include "components/password_manager/core/browser/password_bubble_experiment.h" |
| 16 #include "components/password_manager/core/browser/password_manager_constants.h" | 20 #include "components/password_manager/core/browser/password_manager_constants.h" |
| 21 #include "components/password_manager/core/browser/password_ui_utils.h" |
| 17 #include "components/password_manager/core/common/experiments.h" | 22 #include "components/password_manager/core/common/experiments.h" |
| 18 #include "jni/PasswordUIView_jni.h" | 23 #include "jni/PasswordUIView_jni.h" |
| 24 #include "ui/base/l10n/l10n_util.h" |
| 19 | 25 |
| 20 using base::android::ConvertUTF16ToJavaString; | 26 using base::android::ConvertUTF16ToJavaString; |
| 21 using base::android::ConvertUTF8ToJavaString; | 27 using base::android::ConvertUTF8ToJavaString; |
| 22 using base::android::ScopedJavaLocalRef; | 28 using base::android::ScopedJavaLocalRef; |
| 23 | 29 |
| 30 namespace { |
| 31 |
| 32 // Returns the human readable version of the origin string displayed in |
| 33 // Chrome settings for |form|. |
| 34 std::string GetDisplayOriginForSettings(const autofill::PasswordForm& form) { |
| 35 bool is_android_uri = false; |
| 36 bool is_clickable = false; |
| 37 GURL link_url; // TODO(crbug.com/617094) Also display link_url. |
| 38 std::string human_readable_origin = |
| 39 password_manager::GetShownOriginAndLinkUrl(form, &is_android_uri, |
| 40 &link_url, |
| 41 &is_clickable); |
| 42 if (!is_clickable) { |
| 43 DCHECK(is_android_uri); |
| 44 human_readable_origin = password_manager::StripAndroidAndReverse( |
| 45 human_readable_origin); |
| 46 human_readable_origin = human_readable_origin + |
| 47 l10n_util::GetStringUTF8(IDS_PASSWORDS_ANDROID_URI_SUFFIX); |
| 48 } |
| 49 return human_readable_origin; |
| 50 } |
| 51 |
| 52 } // namespace |
| 53 |
| 24 PasswordUIViewAndroid::PasswordUIViewAndroid(JNIEnv* env, jobject obj) | 54 PasswordUIViewAndroid::PasswordUIViewAndroid(JNIEnv* env, jobject obj) |
| 25 : password_manager_presenter_(this), weak_java_ui_controller_(env, obj) {} | 55 : password_manager_presenter_(this), weak_java_ui_controller_(env, obj) {} |
| 26 | 56 |
| 27 PasswordUIViewAndroid::~PasswordUIViewAndroid() {} | 57 PasswordUIViewAndroid::~PasswordUIViewAndroid() {} |
| 28 | 58 |
| 29 void PasswordUIViewAndroid::Destroy(JNIEnv*, const JavaParamRef<jobject>&) { | 59 void PasswordUIViewAndroid::Destroy(JNIEnv*, const JavaParamRef<jobject>&) { |
| 30 delete this; | 60 delete this; |
| 31 } | 61 } |
| 32 | 62 |
| 33 Profile* PasswordUIViewAndroid::GetProfile() { | 63 Profile* PasswordUIViewAndroid::GetProfile() { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 const JavaParamRef<jobject>&, | 105 const JavaParamRef<jobject>&, |
| 76 int index) { | 106 int index) { |
| 77 const autofill::PasswordForm* form = | 107 const autofill::PasswordForm* form = |
| 78 password_manager_presenter_.GetPassword(index); | 108 password_manager_presenter_.GetPassword(index); |
| 79 if (!form) { | 109 if (!form) { |
| 80 return Java_PasswordUIView_createSavedPasswordEntry( | 110 return Java_PasswordUIView_createSavedPasswordEntry( |
| 81 env, | 111 env, |
| 82 ConvertUTF8ToJavaString(env, std::string()).obj(), | 112 ConvertUTF8ToJavaString(env, std::string()).obj(), |
| 83 ConvertUTF16ToJavaString(env, base::string16()).obj()); | 113 ConvertUTF16ToJavaString(env, base::string16()).obj()); |
| 84 } | 114 } |
| 85 std::string human_readable_origin = | 115 std::string human_readable_origin = GetDisplayOriginForSettings(*form); |
| 86 password_manager::GetHumanReadableOrigin(*form); | |
| 87 return Java_PasswordUIView_createSavedPasswordEntry( | 116 return Java_PasswordUIView_createSavedPasswordEntry( |
| 88 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), | 117 env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(), |
| 89 ConvertUTF16ToJavaString(env, form->username_value).obj()); | 118 ConvertUTF16ToJavaString(env, form->username_value).obj()); |
| 90 } | 119 } |
| 91 | 120 |
| 92 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( | 121 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( |
| 93 JNIEnv* env, | 122 JNIEnv* env, |
| 94 const JavaParamRef<jobject>&, | 123 const JavaParamRef<jobject>&, |
| 95 int index) { | 124 int index) { |
| 96 const autofill::PasswordForm* form = | 125 const autofill::PasswordForm* form = |
| 97 password_manager_presenter_.GetPasswordException(index); | 126 password_manager_presenter_.GetPasswordException(index); |
| 98 if (!form) | 127 if (!form) |
| 99 return ConvertUTF8ToJavaString(env, std::string()); | 128 return ConvertUTF8ToJavaString(env, std::string()); |
| 100 std::string human_readable_origin = | 129 std::string human_readable_origin = GetDisplayOriginForSettings(*form); |
| 101 password_manager::GetHumanReadableOrigin(*form); | |
| 102 return ConvertUTF8ToJavaString(env, human_readable_origin); | 130 return ConvertUTF8ToJavaString(env, human_readable_origin); |
| 103 } | 131 } |
| 104 | 132 |
| 105 void PasswordUIViewAndroid::HandleRemoveSavedPasswordEntry( | 133 void PasswordUIViewAndroid::HandleRemoveSavedPasswordEntry( |
| 106 JNIEnv* env, | 134 JNIEnv* env, |
| 107 const JavaParamRef<jobject>&, | 135 const JavaParamRef<jobject>&, |
| 108 int index) { | 136 int index) { |
| 109 password_manager_presenter_.RemoveSavedPassword(index); | 137 password_manager_presenter_.RemoveSavedPassword(index); |
| 110 } | 138 } |
| 111 | 139 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 133 | 161 |
| 134 // static | 162 // static |
| 135 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 163 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 136 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); | 164 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); |
| 137 return reinterpret_cast<intptr_t>(controller); | 165 return reinterpret_cast<intptr_t>(controller); |
| 138 } | 166 } |
| 139 | 167 |
| 140 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { | 168 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { |
| 141 return RegisterNativesImpl(env); | 169 return RegisterNativesImpl(env); |
| 142 } | 170 } |
| OLD | NEW |