Merge 241255 "[Mac] Passwords: Don't always prompt to access pas..."

chrome/browser/password_manager/password_store.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 31 matching lines @@
 // The login request/manipulation API is not threadsafe and must be used
 // from the UI thread.
 class PasswordStore
     : public RefcountedBrowserContextKeyedService,
       public CancelableRequestProvider {
  public:
   typedef base::Callback<
       void(Handle, const std::vector<autofill::PasswordForm*>&)>
       GetLoginsCallback;
 
+  // Whether or not it's acceptable for Chrome to request access to locked
+  // passwords, which requires prompting the user for permission.
+  enum AuthorizationPromptPolicy {
+    ALLOW_PROMPT,
+    DISALLOW_PROMPT
+  };
+
   // PasswordForm vector elements are meant to be owned by the
   // PasswordStoreConsumer. However, if the request is canceled after the
   // allocation, then the request must take care of the deletion.
   class GetLoginsRequest
       : public CancelableRequest1<GetLoginsCallback,
                                   std::vector<autofill::PasswordForm*> > {
    public:
     explicit GetLoginsRequest(const GetLoginsCallback& callback);
 
     void set_ignore_logins_cutoff(const base::Time& cutoff) {
@@ skipping 38 matching lines @@
 
   // Removes the matching PasswordForm from the secure password store (async).
   void RemoveLogin(const autofill::PasswordForm& form);
 
   // Removes all logins created in the given date range.
   void RemoveLoginsCreatedBetween(const base::Time& delete_begin,
                                   const base::Time& delete_end);
 
   // Searches for a matching PasswordForm and returns a ID so the async request
   // can be tracked. Implement the PasswordStoreConsumer interface to be
-  // notified on completion.
+  // notified on completion. |prompt_policy| indicates whether it's permissible
+  // to prompt the user to authorize access to locked passwords. This argument
+  // is only used on platforms that support prompting the user for access (such
+  // as Mac OS). NOTE: This means that this method can return different results
+  // depending on the value of |prompt_policy|.
   virtual CancelableTaskTracker::TaskId GetLogins(
       const autofill::PasswordForm& form,
+      AuthorizationPromptPolicy prompt_policy,
       PasswordStoreConsumer* consumer);
 
   // Gets the complete list of PasswordForms that are not blacklist entries--and
   // are thus auto-fillable--and returns a handle so the async request can be
   // tracked. Implement the PasswordStoreConsumer interface to be notified on
   // completion.
   Handle GetAutofillableLogins(PasswordStoreConsumer* consumer);
 
   // Gets the complete list of PasswordForms that are blacklist entries, and
   // returns a handle so the async request can be tracked. Implement the
@@ skipping 53 matching lines @@
                                               const base::Time& delete_end) = 0;
 
   typedef base::Callback<void(const std::vector<autofill::PasswordForm*>&)>
       ConsumerCallbackRunner;  // Owns all PasswordForms in the vector.
 
   // Should find all PasswordForms with the same signon_realm. The results
   // will then be scored by the PasswordFormManager. Once they are found
   // (or not), the consumer should be notified.
   virtual void GetLoginsImpl(
       const autofill::PasswordForm& form,
+      AuthorizationPromptPolicy prompt_policy,
       const ConsumerCallbackRunner& callback_runner) = 0;
 
   // Finds all non-blacklist PasswordForms, and notifies the consumer.
   virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) = 0;
   // Finds all blacklist PasswordForms, and notifies the consumer.
   virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) = 0;
 
   // Finds all non-blacklist PasswordForms, and fills the vector.
   virtual bool FillAutofillableLogins(
       std::vector<autofill::PasswordForm*>* forms) = 0;
@@ skipping 41 matching lines @@
   // may have been changed.
   void NotifyLoginsChanged();
 
   // The observers.
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStore);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_