Integrate the account chooser dialog on Mac.

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 <utility>
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 86 matching lines @@
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin,
     base::Callback<void(const password_manager::CredentialInfo&)> callback) {
   DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   PasswordDialogController::FormsVector locals =
       CopyFormVector(local_credentials);
   PasswordDialogController::FormsVector federations =
       CopyFormVector(federated_credentials);
   passwords_data_.OnRequestCredentials(
       std::move(local_credentials), std::move(federated_credentials), origin);
-#if defined(OS_MACOSX)
-  // TODO(vasilii): remove once Mac supports the dialog.
-  // http://crbug.com/550922
-  base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
-#else
   dialog_controller_.reset(new PasswordDialogControllerImpl(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
       this));
   dialog_controller_->ShowAccountChooser(
       CreateAccountChooser(dialog_controller_.get()),
       std::move(locals), std::move(federations));
-#endif
   UpdateBubbleAndIconVisibility();
   if (!should_pop_up_bubble_) {
     passwords_data_.set_credentials_callback(callback);
     return true;
   }
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   return false;
 }
 
 void ManagePasswordsUIController::OnAutoSignin(
@@ skipping 225 matching lines @@
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser)
     return;
   LocationBar* location_bar = browser->window()->GetLocationBar();
   DCHECK(location_bar);
   location_bar->UpdateManagePasswordsIconAndBubble();
 }
 
-#if defined(OS_MACOSX)
-// TODO(vasilii): remove once Mac supports the dialog.
-AccountChooserPrompt* ManagePasswordsUIController::CreateAccountChooser(
-    PasswordDialogController* controller) {
-  return nullptr;
-}
-#else
 AccountChooserPrompt* ManagePasswordsUIController::CreateAccountChooser(
     PasswordDialogController* controller) {
   return CreateAccountChooserPromptView(controller, web_contents());
 }
-#endif
 
 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 redirect occurs. It is possible that the user was
   // not able to interact with the password bubble.
@@ skipping 18 matching lines @@
   CommandUpdater* updater = browser->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }