Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

 // Copyright 2014 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_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_
 
 #include "base/memory/scoped_vector.h"
 #include "base/timer/elapsed_timer.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace password_manager {
+enum class CredentialType : unsigned int;

[vasilii, 2015/01/12 18:36:45]

doesn't match the definition

[melandory, 2015/01/13 09:07:54]

Yes, because I've submit another CL, which changes definition and will allow
forward declaration of CredentialType.

 struct CredentialInfo;
 class PasswordFormManager;
 }
 
 class ManagePasswordsIcon;
 
 // Per-tab class to control the Omnibox password icon and bubble.
 class ManagePasswordsUIController
     : public content::WebContentsObserver,
       public content::WebContentsUserData<ManagePasswordsUIController>,
@@ skipping 42 matching lines @@
   void OnLoginsChanged(
       const password_manager::PasswordStoreChangeList& changes) override;
 
   // Called from the model when the user chooses to save a password; passes the
   // action off to the FormManager. The controller MUST be in a pending state,
   // and WILL be in MANAGE_STATE after this method executes.
   virtual void SavePassword();
 
   // Called from the model when the user chooses a credential.
   // The controller MUST be in a pending credentials state.
-  virtual void ChooseCredential(bool was_chosen,
-                                const autofill::PasswordForm& form);
+  virtual void ChooseCredential(
+      bool was_chosen,

[vasilii, 2015/01/12 18:36:45]

no need for this parameter anymore

[melandory, 2015/01/13 10:16:02]

Done.

+      const autofill::PasswordForm& form,
+      password_manager::CredentialType credential_type);
 
   // Called from the model when the user chooses to never save passwords; passes
   // the action off to the FormManager. The controller MUST be in a pending
   // state, and WILL be in BLACKLIST_STATE after this method executes.
   virtual void NeverSavePassword();
 
   // Called from the model when the user chooses to unblacklist the site. The
   // controller MUST be in BLACKLIST_STATE, and WILL be in MANAGE_STATE after
   // this method executes.
   virtual void UnblacklistSite();
 
   // Open a new tab, pointing to the password manager settings page.
   virtual void NavigateToPasswordManagerSettingsPage();
 
   virtual const autofill::PasswordForm& PendingPassword() const;
 
   // Set the state of the Omnibox icon, and possibly show the associated bubble
   // without user interaction.
   virtual void UpdateIconAndBubbleState(ManagePasswordsIcon* icon);
 
   // Called from the model when the bubble is displayed.
   void OnBubbleShown();
 
   password_manager::ui::State state() const { return state_; }
 
   ScopedVector<autofill::PasswordForm>& new_password_forms() {

[vasilii, 2015/01/12 18:36:45]

unused

     return new_password_forms_;
   }
 
+  ScopedVector<autofill::PasswordForm>& federated_credentials_forms() {
+    return federated_credentials_forms_;
+  }
+
+  ScopedVector<autofill::PasswordForm>& local_credentials_forms() {
+    return local_credentials_forms_;
+  }
+
   // True if a password is sitting around, waiting for a user to decide whether
   // or not to save it.
   bool PasswordPendingUserDecision() const;
 
   const autofill::ConstPasswordFormMap& best_matches() const {
     return password_form_map_;
   }
 
   const GURL& origin() const { return origin_; }
 
@@ skipping 21 matching lines @@
       const content::FrameNavigateParams& params) override;
   void WasHidden() override;
 
   // Sets |state_|. Protected so we can manipulate the value in tests.
   void SetState(password_manager::ui::State state);
 
   // We create copies of PasswordForm objects that come in with unclear lifetime
   // and store them in this vector as well as in |password_form_map_| to ensure
   // that we destroy them correctly. If |new_password_forms_| gets cleared then
   // |password_form_map_| is to be cleared too.
   ScopedVector<autofill::PasswordForm> new_password_forms_;

[Mike West, 2015/01/13 19:41:46]

I think you can kill this as well.

[vasilii, 2015/01/14 09:57:48]

It is for the traditional bubble. In case user adds a new form while the bubble
is open. However, the code for handling this is broken anyway.

 
+  // Federated credentials.
+  ScopedVector<autofill::PasswordForm> federated_credentials_forms_;
+
+  // Local credentials.
+  ScopedVector<autofill::PasswordForm> local_credentials_forms_;
+
   // All previously stored credentials for a specific site.
   // Protected, not private, so we can mess with the value in
   // ManagePasswordsUIControllerMock.
   autofill::ConstPasswordFormMap password_form_map_;
 
  private:
   friend class content::WebContentsUserData<ManagePasswordsUIController>;
 
   // Shows the password bubble without user interaction. The controller MUST
   // be in PENDING_PASSWORD_AND_BUBBLE_STATE.
@@ skipping 26 matching lines @@
 
   // The origin of the form we're currently dealing with; we'll use this to
   // determine which PasswordStore changes we should care about when updating
   // |password_form_map_|.
   GURL origin_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsUIController);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_