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" |
11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 13 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
14 #include "chrome/browser/password_manager/credential_android.h" | 14 #include "chrome/browser/password_manager/credential_android.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/sync/profile_sync_service_factory.h" | 16 #include "chrome/browser/sync/profile_sync_service_factory.h" |
17 #include "chrome/browser/ui/passwords/account_avatar_fetcher.h" | 17 #include "chrome/browser/ui/passwords/account_avatar_fetcher.h" |
18 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" | 18 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" |
19 #include "chrome/grit/generated_resources.h" | 19 #include "chrome/grit/generated_resources.h" |
20 #include "components/browser_sync/browser/profile_sync_service.h" | 20 #include "components/browser_sync/browser/profile_sync_service.h" |
21 #include "components/password_manager/core/browser/password_bubble_experiment.h" | 21 #include "components/password_manager/core/browser/password_bubble_experiment.h" |
22 #include "components/password_manager/core/browser/password_manager_constants.h" | 22 #include "components/password_manager/core/browser/password_manager_constants.h" |
| 23 #include "components/password_manager/core/browser/password_ui_utils.h" |
23 #include "components/password_manager/core/common/credential_manager_types.h" | 24 #include "components/password_manager/core/common/credential_manager_types.h" |
24 #include "jni/AccountChooserDialog_jni.h" | 25 #include "jni/AccountChooserDialog_jni.h" |
25 #include "ui/android/window_android.h" | 26 #include "ui/android/window_android.h" |
26 #include "ui/gfx/android/java_bitmap.h" | 27 #include "ui/gfx/android/java_bitmap.h" |
27 #include "ui/gfx/range/range.h" | 28 #include "ui/gfx/range/range.h" |
28 | 29 |
29 using base::android::AttachCurrentThread; | 30 using base::android::AttachCurrentThread; |
30 using base::android::ConvertUTF16ToJavaString; | 31 using base::android::ConvertUTF16ToJavaString; |
31 | 32 |
32 namespace { | 33 namespace { |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 } | 103 } |
103 | 104 |
104 }; // namespace | 105 }; // namespace |
105 | 106 |
106 AccountChooserDialogAndroid::AccountChooserDialogAndroid( | 107 AccountChooserDialogAndroid::AccountChooserDialogAndroid( |
107 content::WebContents* web_contents, | 108 content::WebContents* web_contents, |
108 ScopedVector<autofill::PasswordForm> local_credentials, | 109 ScopedVector<autofill::PasswordForm> local_credentials, |
109 ScopedVector<autofill::PasswordForm> federated_credentials, | 110 ScopedVector<autofill::PasswordForm> federated_credentials, |
110 const GURL& origin, | 111 const GURL& origin, |
111 const ManagePasswordsState::CredentialsCallback& callback) | 112 const ManagePasswordsState::CredentialsCallback& callback) |
112 : web_contents_(web_contents) { | 113 : web_contents_(web_contents), origin_(origin) { |
113 passwords_data_.set_client( | 114 passwords_data_.set_client( |
114 ChromePasswordManagerClient::FromWebContents(web_contents_)); | 115 ChromePasswordManagerClient::FromWebContents(web_contents_)); |
115 passwords_data_.OnRequestCredentials( | 116 passwords_data_.OnRequestCredentials( |
116 std::move(local_credentials), std::move(federated_credentials), origin); | 117 std::move(local_credentials), std::move(federated_credentials), origin); |
117 passwords_data_.set_credentials_callback(callback); | 118 passwords_data_.set_credentials_callback(callback); |
118 } | 119 } |
119 | 120 |
120 AccountChooserDialogAndroid::~AccountChooserDialogAndroid() {} | 121 AccountChooserDialogAndroid::~AccountChooserDialogAndroid() {} |
121 | 122 |
122 void AccountChooserDialogAndroid::ShowDialog() { | 123 void AccountChooserDialogAndroid::ShowDialog() { |
(...skipping 16 matching lines...) Expand all Loading... |
139 password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD); | 140 password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD); |
140 AddElementsToJavaCredentialArray( | 141 AddElementsToJavaCredentialArray( |
141 env, java_credentials_array, federated_credentials_forms(), | 142 env, java_credentials_array, federated_credentials_forms(), |
142 password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED, | 143 password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED, |
143 local_credentials_forms().size()); | 144 local_credentials_forms().size()); |
144 base::android::ScopedJavaGlobalRef<jobject> java_dialog_global; | 145 base::android::ScopedJavaGlobalRef<jobject> java_dialog_global; |
145 java_dialog_global.Reset(Java_AccountChooserDialog_createAccountChooser( | 146 java_dialog_global.Reset(Java_AccountChooserDialog_createAccountChooser( |
146 env, native_window->GetJavaObject().obj(), | 147 env, native_window->GetJavaObject().obj(), |
147 reinterpret_cast<intptr_t>(this), java_credentials_array.obj(), | 148 reinterpret_cast<intptr_t>(this), java_credentials_array.obj(), |
148 base::android::ConvertUTF16ToJavaString(env, title).obj(), | 149 base::android::ConvertUTF16ToJavaString(env, title).obj(), |
149 title_link_range.start(), title_link_range.end())); | 150 title_link_range.start(), title_link_range.end(), |
| 151 base::android::ConvertUTF8ToJavaString( |
| 152 env, password_manager::GetShownOrigin(origin_, std::string())) |
| 153 .obj())); |
150 base::android::ScopedJavaLocalRef<jobject> java_dialog(java_dialog_global); | 154 base::android::ScopedJavaLocalRef<jobject> java_dialog(java_dialog_global); |
151 net::URLRequestContextGetter* request_context = | 155 net::URLRequestContextGetter* request_context = |
152 Profile::FromBrowserContext(web_contents_->GetBrowserContext()) | 156 Profile::FromBrowserContext(web_contents_->GetBrowserContext()) |
153 ->GetRequestContext(); | 157 ->GetRequestContext(); |
154 FetchAvatars(java_dialog_global, local_credentials_forms(), 0, | 158 FetchAvatars(java_dialog_global, local_credentials_forms(), 0, |
155 request_context); | 159 request_context); |
156 FetchAvatars(java_dialog_global, federated_credentials_forms(), | 160 FetchAvatars(java_dialog_global, federated_credentials_forms(), |
157 local_credentials_forms().size(), request_context); | 161 local_credentials_forms().size(), request_context); |
158 } | 162 } |
159 | 163 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 ? local_credentials_forms() | 216 ? local_credentials_forms() |
213 : federated_credentials_forms(); | 217 : federated_credentials_forms(); |
214 if (index < credentials_forms.size()) { | 218 if (index < credentials_forms.size()) { |
215 passwords_data_.ChooseCredential(*credentials_forms[index], type); | 219 passwords_data_.ChooseCredential(*credentials_forms[index], type); |
216 } | 220 } |
217 } | 221 } |
218 | 222 |
219 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) { | 223 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) { |
220 return RegisterNativesImpl(env); | 224 return RegisterNativesImpl(env); |
221 } | 225 } |
OLD | NEW |