| Index: chrome/browser/password_manager/native_backend_libsecret.h
|
| diff --git a/chrome/browser/password_manager/native_backend_libsecret.h b/chrome/browser/password_manager/native_backend_libsecret.h
|
| index d7af02e1eb36e122e6595841723f87ad7ca72bc8..15dfc3997b7d6ea99d07f35c64b69a0029213080 100644
|
| --- a/chrome/browser/password_manager/native_backend_libsecret.h
|
| +++ b/chrome/browser/password_manager/native_backend_libsecret.h
|
| @@ -10,6 +10,7 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_vector.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/password_manager/password_store_factory.h"
|
| #include "chrome/browser/password_manager/password_store_x.h"
|
| @@ -69,9 +70,10 @@ class NativeBackendLibsecret : public PasswordStoreX::NativeBackend,
|
| base::Time delete_end,
|
| password_manager::PasswordStoreChangeList* changes) override;
|
| bool GetLogins(const autofill::PasswordForm& form,
|
| - PasswordFormList* forms) override;
|
| - bool GetAutofillableLogins(PasswordFormList* forms) override;
|
| - bool GetBlacklistLogins(PasswordFormList* forms) override;
|
| + ScopedVector<autofill::PasswordForm>* forms) override;
|
| + bool GetAutofillableLogins(
|
| + ScopedVector<autofill::PasswordForm>* forms) override;
|
| + bool GetBlacklistLogins(ScopedVector<autofill::PasswordForm>* forms) override;
|
|
|
| private:
|
| enum TimestampToCompare {
|
| @@ -86,8 +88,8 @@ class NativeBackendLibsecret : public PasswordStoreX::NativeBackend,
|
|
|
| // Search that is used in AddLogin and UpdateLogin methods
|
| void AddUpdateLoginSearch(const autofill::PasswordForm& lookup_form,
|
| - PasswordFormList* forms,
|
| - AddUpdateLoginSearchOptions options);
|
| + AddUpdateLoginSearchOptions options,
|
| + ScopedVector<autofill::PasswordForm>* forms);
|
|
|
| // Adds a login form without checking for one to replace first.
|
| bool RawAddLogin(const autofill::PasswordForm& form);
|
| @@ -99,19 +101,19 @@ class NativeBackendLibsecret : public PasswordStoreX::NativeBackend,
|
| };
|
|
|
| // Reads PasswordForms from the keyring with the given autofillability state.
|
| - bool GetLoginsList(PasswordFormList* forms,
|
| - const autofill::PasswordForm* lookup_form,
|
| - GetLoginsListOptions options);
|
| + bool GetLoginsList(const autofill::PasswordForm* lookup_form,
|
| + GetLoginsListOptions options,
|
| + ScopedVector<autofill::PasswordForm>* forms);
|
|
|
| // Helper for GetLoginsCreatedBetween().
|
| - bool GetAllLogins(PasswordFormList* forms);
|
| + bool GetAllLogins(ScopedVector<autofill::PasswordForm>* forms);
|
|
|
| // Retrieves password created/synced in the time interval. Returns |true| if
|
| // the operation succeeded.
|
| bool GetLoginsBetween(base::Time get_begin,
|
| base::Time get_end,
|
| TimestampToCompare date_to_compare,
|
| - PasswordFormList* forms);
|
| + ScopedVector<autofill::PasswordForm>* forms);
|
|
|
| // Removes password created/synced in the time interval. Returns |true| if the
|
| // operation succeeded. |changes| will contain the changes applied.
|
| @@ -123,7 +125,7 @@ class NativeBackendLibsecret : public PasswordStoreX::NativeBackend,
|
| // convert data get from Libsecret to Passwordform
|
| bool ConvertFormList(GList* found,
|
| const autofill::PasswordForm* lookup_form,
|
| - NativeBackendLibsecret::PasswordFormList* forms);
|
| + ScopedVector<autofill::PasswordForm>* forms);
|
|
|
| // Generates a profile-specific app string based on profile_id_.
|
| static std::string GetProfileSpecificAppString(LocalProfileId id);
|
|
|