Chromium Code Reviews| 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 2134b206b3b1b84dc587f8bf94b140b12e0d5422..d22cae93084d693e9d076b44252aab5ed908d017 100644 |
| --- a/chrome/browser/password_manager/native_backend_gnome_x.cc |
| +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc |
| @@ -159,7 +159,8 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) { |
| form->icon_url = GURL(string_attr_map["avatar_url"]); |
| form->federation_origin = |
| url::Origin(GURL(string_attr_map["federation_url"])); |
| - form->skip_zero_click = uint_attr_map["skip_zero_click"]; |
| + if (uint_attr_map.count("should_skip_zero_click")) |
| + form->skip_zero_click = uint_attr_map["should_skip_zero_click"]; |
|
vasilii
2016/02/26 11:46:30
I'd prefer an explicit "true" here if it's not fou
|
| form->generation_upload_status = |
| static_cast<PasswordForm::GenerationUploadStatus>( |
| uint_attr_map["generation_upload_status"]); |
| @@ -246,7 +247,7 @@ const GnomeKeyringPasswordSchema kGnomeSchema = { |
| { "display_name", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING }, |
| { "avatar_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING }, |
| { "federation_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING }, |
| - { "skip_zero_click", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 }, |
| + { "should_skip_zero_click", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 }, |
| { "generation_upload_status", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 }, |
| { "form_data", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING }, |
| // This field is always "chrome" so that we can search for it. |
| @@ -371,7 +372,7 @@ void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) { |
| "display_name", UTF16ToUTF8(form.display_name).c_str(), |
| "avatar_url", form.icon_url.spec().c_str(), |
| "federation_url", form.federation_origin.Serialize().c_str(), |
| - "skip_zero_click", form.skip_zero_click, |
| + "should_skip_zero_click", form.skip_zero_click, |
| "generation_upload_status", form.generation_upload_status, |
| "form_data", form_data.c_str(), |
| "application", app_string, |