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 237 matching lines @@
   DCHECK_EQ(password_manager::ui::BLACKLIST_STATE, state());
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   DCHECK(GetCurrentForms().front()->blacklisted_by_user);
   if (password_store)
     password_store->RemoveLogin(*GetCurrentForms().front());
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
+void ManagePasswordsUIController::ManageAccounts() {
+  DCHECK_EQ(password_manager::ui::AUTO_SIGNIN_STATE, state());
+  passwords_data_.TransitionToState(password_manager::ui::MANAGE_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 33 matching lines @@
   } else {
     icon->SetState(state());
   }
 }
 
 void ManagePasswordsUIController::OnBubbleShown() {
   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::MANAGE_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;
-
-  if (next_state != state()) {
-    if (next_state == password_manager::ui::INACTIVE_STATE)
-      passwords_data_.OnInactive();
-    else
-      passwords_data_.TransitionToState(next_state);
+  if (state() == password_manager::ui::CREDENTIAL_REQUEST_STATE ||
+      state() == password_manager::ui::CONFIRMATION_STATE ||
+      state() == password_manager::ui::AUTO_SIGNIN_STATE) {
+    passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
     UpdateBubbleAndIconVisibility();
   }
 }
 
 void ManagePasswordsUIController::ShowBubbleWithoutUserInteraction() {
   DCHECK(should_pop_up_bubble_);
 #if !defined(OS_ANDROID)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser || browser->toolbar_model()->input_in_progress())
     return;
   if (state() == password_manager::ui::PENDING_PASSWORD_STATE &&
       !password_bubble_experiment::ShouldShowBubble(
           browser->profile()->GetPrefs()))
     return;
   CommandUpdater* updater = browser->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 #endif
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }