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

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

Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iOS2 Created 4 years, 10 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
Index: chrome/browser/password_manager/native_backend_gnome_x.cc
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc
index 6771e7d1c2bda77d69eaad3287e84b8e43220eea..2134b206b3b1b84dc587f8bf94b140b12e0d5422 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x.cc
@@ -157,7 +157,8 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) {
form->date_synced = base::Time::FromInternalValue(date_synced);
form->display_name = UTF8ToUTF16(string_attr_map["display_name"]);
form->icon_url = GURL(string_attr_map["avatar_url"]);
- form->federation_url = GURL(string_attr_map["federation_url"]);
+ form->federation_origin =
+ url::Origin(GURL(string_attr_map["federation_url"]));
form->skip_zero_click = uint_attr_map["skip_zero_click"];
form->generation_upload_status =
static_cast<PasswordForm::GenerationUploadStatus>(
@@ -344,13 +345,13 @@ void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) {
int64_t date_synced = form.date_synced.ToInternalValue();
std::string form_data;
SerializeFormDataToBase64String(form.form_data, &form_data);
+ // clang-format off
gnome_keyring_store_password(
&kGnomeSchema,
- nullptr, // Default keyring.
+ nullptr, // Default keyring.
form.origin.spec().c_str(), // Display name.
- UTF16ToUTF8(form.password_value).c_str(),
- OnOperationDone,
- this, // data
+ UTF16ToUTF8(form.password_value).c_str(), OnOperationDone,
+ this, // data
nullptr, // destroy_data
"origin_url", form.origin.spec().c_str(),
"action_url", form.action.spec().c_str(),
@@ -369,12 +370,13 @@ void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) {
"date_synced", base::Int64ToString(date_synced).c_str(),
"display_name", UTF16ToUTF8(form.display_name).c_str(),
"avatar_url", form.icon_url.spec().c_str(),
- "federation_url", form.federation_url.spec().c_str(),
+ "federation_url", form.federation_origin.Serialize().c_str(),
"skip_zero_click", form.skip_zero_click,
"generation_upload_status", form.generation_upload_status,
"form_data", form_data.c_str(),
"application", app_string,
nullptr);
+ // clang-format on
}
void GKRMethod::LoginSearch(const PasswordForm& form,

Powered by Google App Engine
This is Rietveld 408576698