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

Side by Side Diff: chrome/browser/android/password_ui_view_android.cc

Issue 1140943002: [Smart Lock] Prettify android:// URIs shown on "Passwords page" for Clank. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/prefs/pref_service.h"
11 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
14 #include "chrome/common/pref_names.h"
12 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
13 #include "components/autofill/core/common/password_form.h" 16 #include "components/autofill/core/common/password_form.h"
14 #include "components/password_manager/core/common/experiments.h" 17 #include "components/password_manager/core/common/experiments.h"
15 #include "components/password_manager/core/common/password_manager_switches.h" 18 #include "components/password_manager/core/common/password_manager_switches.h"
16 #include "jni/PasswordUIView_jni.h" 19 #include "jni/PasswordUIView_jni.h"
17 20
18 using base::android::ConvertUTF16ToJavaString; 21 using base::android::ConvertUTF16ToJavaString;
19 using base::android::ConvertUTF8ToJavaString; 22 using base::android::ConvertUTF8ToJavaString;
20 using base::android::ScopedJavaLocalRef; 23 using base::android::ScopedJavaLocalRef;
21 24
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ScopedJavaLocalRef<jobject> 69 ScopedJavaLocalRef<jobject>
67 PasswordUIViewAndroid::GetSavedPasswordEntry(JNIEnv* env, jobject, int index) { 70 PasswordUIViewAndroid::GetSavedPasswordEntry(JNIEnv* env, jobject, int index) {
68 const autofill::PasswordForm* form = 71 const autofill::PasswordForm* form =
69 password_manager_presenter_.GetPassword(index); 72 password_manager_presenter_.GetPassword(index);
70 if (!form) { 73 if (!form) {
71 return Java_PasswordUIView_createSavedPasswordEntry( 74 return Java_PasswordUIView_createSavedPasswordEntry(
72 env, 75 env,
73 ConvertUTF8ToJavaString(env, std::string()).obj(), 76 ConvertUTF8ToJavaString(env, std::string()).obj(),
74 ConvertUTF16ToJavaString(env, base::string16()).obj()); 77 ConvertUTF16ToJavaString(env, base::string16()).obj());
75 } 78 }
79 std::string human_readable_origin = GetHumanReadableOrigin(
80 *form, GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages));
76 return Java_PasswordUIView_createSavedPasswordEntry( 81 return Java_PasswordUIView_createSavedPasswordEntry(
77 env, 82 env, ConvertUTF8ToJavaString(
78 ConvertUTF8ToJavaString(env, form->origin.spec()).obj(), 83 env, human_readable_origin).obj(),
79 ConvertUTF16ToJavaString(env, form->username_value).obj()); 84 ConvertUTF16ToJavaString(env, form->username_value).obj());
80 } 85 }
81 86
82 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException( 87 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException(
83 JNIEnv* env, jobject, int index) { 88 JNIEnv* env, jobject, int index) {
84 const autofill::PasswordForm* form = 89 const autofill::PasswordForm* form =
85 password_manager_presenter_.GetPasswordException(index); 90 password_manager_presenter_.GetPasswordException(index);
86 if (!form) 91 if (!form)
87 return ConvertUTF8ToJavaString(env, std::string()); 92 return ConvertUTF8ToJavaString(env, std::string());
88 return ConvertUTF8ToJavaString(env, form->origin.spec()); 93 return ConvertUTF8ToJavaString(env, form->origin.spec());
engedy 2015/05/13 13:22:34 As I have recently learned, we will also need the
melandory 2015/05/13 13:29:16 Done. Thanks for catching this issue!
89 } 94 }
90 95
91 void PasswordUIViewAndroid::HandleRemoveSavedPasswordEntry( 96 void PasswordUIViewAndroid::HandleRemoveSavedPasswordEntry(
92 JNIEnv* env, jobject, int index) { 97 JNIEnv* env, jobject, int index) {
93 password_manager_presenter_.RemoveSavedPassword(index); 98 password_manager_presenter_.RemoveSavedPassword(index);
94 } 99 }
95 100
96 void PasswordUIViewAndroid::HandleRemoveSavedPasswordException( 101 void PasswordUIViewAndroid::HandleRemoveSavedPasswordException(
97 JNIEnv* env, jobject, int index) { 102 JNIEnv* env, jobject, int index) {
98 password_manager_presenter_.RemovePasswordException(index); 103 password_manager_presenter_.RemovePasswordException(index);
(...skipping 11 matching lines...) Expand all
110 115
111 // static 116 // static
112 static jlong Init(JNIEnv* env, jobject obj) { 117 static jlong Init(JNIEnv* env, jobject obj) {
113 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); 118 PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj);
114 return reinterpret_cast<intptr_t>(controller); 119 return reinterpret_cast<intptr_t>(controller);
115 } 120 }
116 121
117 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { 122 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) {
118 return RegisterNativesImpl(env); 123 return RegisterNativesImpl(env);
119 } 124 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698