Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1539)

Unified Diff: chrome/browser/password_manager/credential_android.cc

Issue 1007403003: [Smart Lock] Display identity provider information in account chooser infobar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/credential_android.cc
diff --git a/chrome/browser/password_manager/credential_android.cc b/chrome/browser/password_manager/credential_android.cc
index bc4ce1b094b3e21e04ba710225223b39ca003ab9..291102b2835b8cfc81babb3734705b095f0b00c3 100644
--- a/chrome/browser/password_manager/credential_android.cc
+++ b/chrome/browser/password_manager/credential_android.cc
@@ -5,7 +5,10 @@
#include "chrome/browser/password_manager/credential_android.h"
#include "base/android/jni_string.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/grit/generated_resources.h"
#include "jni/Credential_jni.h"
+#include "ui/base/l10n/l10n_util.h"
base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential(
JNIEnv* env,
@@ -14,10 +17,16 @@ base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential(
int type) {
using base::android::ConvertUTF16ToJavaString;
using base::android::ConvertUTF8ToJavaString;
+ std::string federation =
+ password_form.federation_url.is_empty()
+ ? ""
+ : l10n_util::GetStringFUTF8(
+ IDS_MANAGE_PASSWORDS_IDENTITY_PROVIDER,
+ base::ASCIIToUTF16(password_form.federation_url.host()));
return Java_Credential_createCredential(
env, ConvertUTF16ToJavaString(env, password_form.username_value).obj(),
- ConvertUTF16ToJavaString(env, password_form.display_name).obj(), type,
- position);
+ ConvertUTF16ToJavaString(env, password_form.display_name).obj(),
+ ConvertUTF8ToJavaString(env, federation).obj(), type, position);
}
base::android::ScopedJavaLocalRef<jobjectArray> CreateNativeCredentialArray(
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698