| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/password_manager/account_chooser_dialog_android.h" | 5 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 : AccountAvatarFetcher(url, base::WeakPtr<AccountAvatarFetcherDelegate>()), | 78 : AccountAvatarFetcher(url, base::WeakPtr<AccountAvatarFetcherDelegate>()), |
| 79 index_(index), | 79 index_(index), |
| 80 java_dialog_(java_dialog) {} | 80 java_dialog_(java_dialog) {} |
| 81 | 81 |
| 82 void AvatarFetcherAndroid::OnFetchComplete(const GURL& url, | 82 void AvatarFetcherAndroid::OnFetchComplete(const GURL& url, |
| 83 const SkBitmap* bitmap) { | 83 const SkBitmap* bitmap) { |
| 84 if (bitmap) { | 84 if (bitmap) { |
| 85 base::android::ScopedJavaLocalRef<jobject> java_bitmap = | 85 base::android::ScopedJavaLocalRef<jobject> java_bitmap = |
| 86 gfx::ConvertToJavaBitmap(bitmap); | 86 gfx::ConvertToJavaBitmap(bitmap); |
| 87 Java_AccountChooserDialog_imageFetchComplete( | 87 Java_AccountChooserDialog_imageFetchComplete( |
| 88 AttachCurrentThread(), java_dialog_.obj(), index_, java_bitmap.obj()); | 88 AttachCurrentThread(), java_dialog_, index_, java_bitmap); |
| 89 } | 89 } |
| 90 delete this; | 90 delete this; |
| 91 } | 91 } |
| 92 | 92 |
| 93 void FetchAvatars( | 93 void FetchAvatars( |
| 94 const base::android::ScopedJavaGlobalRef<jobject>& java_dialog, | 94 const base::android::ScopedJavaGlobalRef<jobject>& java_dialog, |
| 95 const std::vector<const autofill::PasswordForm*>& password_forms, | 95 const std::vector<const autofill::PasswordForm*>& password_forms, |
| 96 int index, | 96 int index, |
| 97 net::URLRequestContextGetter* request_context) { | 97 net::URLRequestContextGetter* request_context) { |
| 98 for (auto* password_form : password_forms) { | 98 for (auto* password_form : password_forms) { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED, | 150 password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED, |
| 151 local_credentials_forms().size()); | 151 local_credentials_forms().size()); |
| 152 base::android::ScopedJavaGlobalRef<jobject> java_dialog_global; | 152 base::android::ScopedJavaGlobalRef<jobject> java_dialog_global; |
| 153 const std::string origin = password_manager::GetShownOrigin(origin_); | 153 const std::string origin = password_manager::GetShownOrigin(origin_); |
| 154 base::string16 signin_button; | 154 base::string16 signin_button; |
| 155 if (local_credentials_forms().size() == 1) { | 155 if (local_credentials_forms().size() == 1) { |
| 156 signin_button = | 156 signin_button = |
| 157 l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN); | 157 l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN); |
| 158 } | 158 } |
| 159 dialog_jobject_.Reset(Java_AccountChooserDialog_createAndShowAccountChooser( | 159 dialog_jobject_.Reset(Java_AccountChooserDialog_createAndShowAccountChooser( |
| 160 env, native_window->GetJavaObject().obj(), | 160 env, native_window->GetJavaObject(), reinterpret_cast<intptr_t>(this), |
| 161 reinterpret_cast<intptr_t>(this), java_credentials_array.obj(), | 161 java_credentials_array, |
| 162 base::android::ConvertUTF16ToJavaString(env, title).obj(), | 162 base::android::ConvertUTF16ToJavaString(env, title), |
| 163 title_link_range.start(), title_link_range.end(), | 163 title_link_range.start(), title_link_range.end(), |
| 164 base::android::ConvertUTF8ToJavaString(env, origin).obj(), | 164 base::android::ConvertUTF8ToJavaString(env, origin), |
| 165 base::android::ConvertUTF16ToJavaString(env, signin_button).obj())); | 165 base::android::ConvertUTF16ToJavaString(env, signin_button))); |
| 166 net::URLRequestContextGetter* request_context = | 166 net::URLRequestContextGetter* request_context = |
| 167 Profile::FromBrowserContext(web_contents_->GetBrowserContext()) | 167 Profile::FromBrowserContext(web_contents_->GetBrowserContext()) |
| 168 ->GetRequestContext(); | 168 ->GetRequestContext(); |
| 169 FetchAvatars(dialog_jobject_, local_credentials_forms(), 0, request_context); | 169 FetchAvatars(dialog_jobject_, local_credentials_forms(), 0, request_context); |
| 170 FetchAvatars(dialog_jobject_, federated_credentials_forms(), | 170 FetchAvatars(dialog_jobject_, federated_credentials_forms(), |
| 171 local_credentials_forms().size(), request_context); | 171 local_credentials_forms().size(), request_context); |
| 172 } | 172 } |
| 173 | 173 |
| 174 void AccountChooserDialogAndroid::OnCredentialClicked( | 174 void AccountChooserDialogAndroid::OnCredentialClicked( |
| 175 JNIEnv* env, | 175 JNIEnv* env, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 198 JNIEnv* env, | 198 JNIEnv* env, |
| 199 const JavaParamRef<jobject>& obj) { | 199 const JavaParamRef<jobject>& obj) { |
| 200 web_contents_->OpenURL(content::OpenURLParams( | 200 web_contents_->OpenURL(content::OpenURLParams( |
| 201 GURL(password_manager::kPasswordManagerHelpCenterSmartLock), | 201 GURL(password_manager::kPasswordManagerHelpCenterSmartLock), |
| 202 content::Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, | 202 content::Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, |
| 203 false /* is_renderer_initiated */)); | 203 false /* is_renderer_initiated */)); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void AccountChooserDialogAndroid::WebContentsDestroyed() { | 206 void AccountChooserDialogAndroid::WebContentsDestroyed() { |
| 207 JNIEnv* env = AttachCurrentThread(); | 207 JNIEnv* env = AttachCurrentThread(); |
| 208 Java_AccountChooserDialog_dismissDialog(env, dialog_jobject_.obj()); | 208 Java_AccountChooserDialog_dismissDialog(env, dialog_jobject_); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void AccountChooserDialogAndroid::WasHidden() { | 211 void AccountChooserDialogAndroid::WasHidden() { |
| 212 // TODO(https://crbug.com/610700): once bug is fixed, this code should be | 212 // TODO(https://crbug.com/610700): once bug is fixed, this code should be |
| 213 // gone. | 213 // gone. |
| 214 OnDialogCancel(); | 214 OnDialogCancel(); |
| 215 JNIEnv* env = AttachCurrentThread(); | 215 JNIEnv* env = AttachCurrentThread(); |
| 216 Java_AccountChooserDialog_dismissDialog(env, dialog_jobject_.obj()); | 216 Java_AccountChooserDialog_dismissDialog(env, dialog_jobject_); |
| 217 } | 217 } |
| 218 | 218 |
| 219 void AccountChooserDialogAndroid::OnDialogCancel() { | 219 void AccountChooserDialogAndroid::OnDialogCancel() { |
| 220 ChooseCredential(-1, password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY, | 220 ChooseCredential(-1, password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY, |
| 221 false /* signin_button_clicked */); | 221 false /* signin_button_clicked */); |
| 222 } | 222 } |
| 223 | 223 |
| 224 const std::vector<const autofill::PasswordForm*>& | 224 const std::vector<const autofill::PasswordForm*>& |
| 225 AccountChooserDialogAndroid::local_credentials_forms() const { | 225 AccountChooserDialogAndroid::local_credentials_forms() const { |
| 226 return passwords_data_.GetCurrentForms(); | 226 return passwords_data_.GetCurrentForms(); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 action); | 258 action); |
| 259 } else { | 259 } else { |
| 260 password_manager::metrics_util::LogAccountChooserUserActionManyAccounts( | 260 password_manager::metrics_util::LogAccountChooserUserActionManyAccounts( |
| 261 action); | 261 action); |
| 262 } | 262 } |
| 263 } | 263 } |
| 264 | 264 |
| 265 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) { | 265 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) { |
| 266 return RegisterNativesImpl(env); | 266 return RegisterNativesImpl(env); |
| 267 } | 267 } |
| OLD | NEW |