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

Side by Side Diff: chrome/browser/password_manager/credential_android.cc

Issue 2716583003: Rename Origin.unique() to opaque().
Patch Set: Update new uses post-rebase Created 3 years, 4 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 unified diff | Download patch
OLDNEW
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/credential_android.h" 5 #include "chrome/browser/password_manager/credential_android.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "jni/Credential_jni.h" 10 #include "jni/Credential_jni.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 #include "url/origin.h" 12 #include "url/origin.h"
13 13
14 base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential( 14 base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential(
15 JNIEnv* env, 15 JNIEnv* env,
16 const autofill::PasswordForm& password_form, 16 const autofill::PasswordForm& password_form,
17 int position) { 17 int position) {
18 using base::android::ConvertUTF16ToJavaString; 18 using base::android::ConvertUTF16ToJavaString;
19 using base::android::ConvertUTF8ToJavaString; 19 using base::android::ConvertUTF8ToJavaString;
20 std::string origin_url = 20 std::string origin_url =
21 password_form.is_public_suffix_match 21 password_form.is_public_suffix_match
22 ? password_form.origin.GetOrigin().spec() 22 ? password_form.origin.GetOrigin().spec()
23 : std::string(); 23 : std::string();
24 std::string federation = 24 std::string federation =
25 password_form.federation_origin.unique() 25 password_form.federation_origin.opaque()
26 ? std::string() 26 ? std::string()
27 : l10n_util::GetStringFUTF8( 27 : l10n_util::GetStringFUTF8(
28 IDS_PASSWORDS_VIA_FEDERATION, 28 IDS_PASSWORDS_VIA_FEDERATION,
29 base::ASCIIToUTF16(password_form.federation_origin.host())); 29 base::ASCIIToUTF16(password_form.federation_origin.host()));
30 return Java_Credential_createCredential( 30 return Java_Credential_createCredential(
31 env, ConvertUTF16ToJavaString(env, password_form.username_value), 31 env, ConvertUTF16ToJavaString(env, password_form.username_value),
32 ConvertUTF16ToJavaString(env, password_form.display_name), 32 ConvertUTF16ToJavaString(env, password_form.display_name),
33 ConvertUTF8ToJavaString(env, origin_url), 33 ConvertUTF8ToJavaString(env, origin_url),
34 ConvertUTF8ToJavaString(env, federation), position); 34 ConvertUTF8ToJavaString(env, federation), position);
35 } 35 }
36 36
37 base::android::ScopedJavaLocalRef<jobjectArray> CreateNativeCredentialArray( 37 base::android::ScopedJavaLocalRef<jobjectArray> CreateNativeCredentialArray(
38 JNIEnv* env, 38 JNIEnv* env,
39 size_t size) { 39 size_t size) {
40 return Java_Credential_createCredentialArray(env, static_cast<int>(size)); 40 return Java_Credential_createCredentialArray(env, static_cast<int>(size));
41 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698