Credential Manager API: pop up the new "Manage accounts" bubble.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // 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.
 
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
@@ skipping 44 matching lines @@
                  ScopedVector<autofill::PasswordForm>* deleter) {
   ConstifyMap(map).swap(*ret);
   deleter->clear();
   for (autofill::ConstPasswordFormMap::iterator i = ret->begin();
        i != ret->end(); ++i) {
     deleter->push_back(new autofill::PasswordForm(*i->second));
     i->second = deleter->back();
   }
 }
 
+void RemoveFormFromVector(const autofill::PasswordForm& form_to_delete,
+                          ScopedVector<autofill::PasswordForm>* forms) {
+  ScopedVector<autofill::PasswordForm>::iterator it = std::find_if(
+      forms->begin(), forms->end(),
+      [&form_to_delete](autofill::PasswordForm* form) {
+    return IsEqualUniqueKey(*form, form_to_delete);
+  });
+  if (it != forms->end())
+    forms->erase(it);
+}
+
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagePasswordsUIController);
 
 ManagePasswordsUIController::ManagePasswordsUIController(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       state_(password_manager::ui::INACTIVE_STATE),
       should_pop_up_bubble_(false) {
   password_manager::PasswordStore* password_store =
@@ skipping 123 matching lines @@
     const password_manager::PasswordStoreChangeList& changes) {
   password_manager::ui::State current_state = state_;
   for (password_manager::PasswordStoreChangeList::const_iterator it =
            changes.begin();
        it != changes.end();
        it++) {
     const autofill::PasswordForm& changed_form = it->form();
     if (changed_form.origin != origin_)
       continue;
 
+    // TODO(vasilii): refactor this messy code after deciding how to transition
+    // within the new Credential Manager API states.
     if (it->type() == password_manager::PasswordStoreChange::REMOVE) {
-      password_form_map_.erase(changed_form.username_value);
+      if (current_state == password_manager::ui::AUTO_SIGNIN_STATE ||
+          current_state == password_manager::ui::MANAGE_ACCOUNTS_STATE) {
+        RemoveFormFromVector(changed_form, &local_credentials_forms_);
+      } else {
+        password_form_map_.erase(changed_form.username_value);
+      }
       if (changed_form.blacklisted_by_user)
         SetState(password_manager::ui::MANAGE_STATE);
     } else {
-      new_password_forms_.push_back(new autofill::PasswordForm(changed_form));
-      password_form_map_[changed_form.username_value] =
-          new_password_forms_.back();
+      if (current_state == password_manager::ui::AUTO_SIGNIN_STATE ||
+          current_state == password_manager::ui::MANAGE_ACCOUNTS_STATE) {
+        if (it->type() == password_manager::PasswordStoreChange::UPDATE) {
+          RemoveFormFromVector(changed_form, &local_credentials_forms_);
+        }
+        local_credentials_forms_.push_back(
+            new autofill::PasswordForm(changed_form));
+      } else {
+        new_password_forms_.push_back(new autofill::PasswordForm(changed_form));
+        password_form_map_[changed_form.username_value] =
+            new_password_forms_.back();
+      }
       if (changed_form.blacklisted_by_user)
         SetState(password_manager::ui::BLACKLIST_STATE);
     }
   }
-  // TODO(vasilii): handle CREDENTIAL_REQUEST_STATE.
   if (current_state != state_)
     UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::
     NavigateToPasswordManagerSettingsPage() {
 #if defined(OS_ANDROID)
   chrome::android::ChromiumApplication::ShowPasswordSettings();
 #else
   chrome::ShowSettingsSubPage(
@@ skipping 77 matching lines @@
   DCHECK(password_form_map_.begin()->second);
   DCHECK(state_ == password_manager::ui::BLACKLIST_STATE);
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveLogin(*password_form_map_.begin()->second);
   SetState(password_manager::ui::MANAGE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
+void ManagePasswordsUIController::ManageAccounts() {
+  DCHECK_EQ(password_manager::ui::AUTO_SIGNIN_STATE, state_);
+  SetState(password_manager::ui::MANAGE_ACCOUNTS_STATE);
+  base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
+  UpdateBubbleAndIconVisibility();
+}
+
 void ManagePasswordsUIController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Don't react to in-page (fragment) navigations.
   if (details.is_in_page)
     return;
 
   // Don't do anything if a navigation occurs before a user could reasonably
   // interact with the password bubble.
   if (Elapsed() < base::TimeDelta::FromSeconds(1))
@@ skipping 58 matching lines @@
   should_pop_up_bubble_ = false;
 }
 
 void ManagePasswordsUIController::OnBubbleHidden() {
   password_manager::ui::State next_state = state_;
   if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE)
     next_state = password_manager::ui::INACTIVE_STATE;
   else if (state_ == password_manager::ui::CONFIRMATION_STATE)
     next_state = password_manager::ui::MANAGE_STATE;
   else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE)
-    next_state = password_manager::ui::INACTIVE_STATE;
+    next_state = password_manager::ui::MANAGE_ACCOUNTS_STATE;
 
   if (next_state != state_) {
     SetState(next_state);
     UpdateBubbleAndIconVisibility();
   }
 }
 
 void ManagePasswordsUIController::ShowBubbleWithoutUserInteraction() {
   DCHECK(should_pop_up_bubble_);
 #if !defined(OS_ANDROID)
@@ skipping 24 matching lines @@
     ScopedVector<autofill::PasswordForm> local_forms,
     ScopedVector<autofill::PasswordForm> federated_forms) {
   form_manager_.reset();
   origin_ = GURL();
   local_credentials_forms_.swap(local_forms);
   federated_credentials_forms_.swap(federated_forms);
   // The map is useless because usernames may overlap.
   password_form_map_.clear();
   new_password_forms_.clear();
 }