Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

 // Copyright 2013 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_bubble_model.h"
 
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 43 matching lines @@
   password_bubble_experiment::RecordBubbleClosed(profile->GetPrefs(), reason);
 }
 
 base::string16 PendingStateTitleBasedOnSavePasswordPref(
     bool never_save_passwords) {
   return l10n_util::GetStringUTF16(
       never_save_passwords ? IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE
                            : IDS_SAVE_PASSWORD);
 }
 
-class URLCollectionFeedbackSender {
- public:
-  URLCollectionFeedbackSender(content::BrowserContext* context,
-                              const std::string& url);
-  void SendFeedback();
-
- private:
-  static const char kPasswordManagerURLCollectionBucket[];
-  content::BrowserContext* context_;
-  std::string url_;
-
-  DISALLOW_COPY_AND_ASSIGN(URLCollectionFeedbackSender);
-};
-
-const char URLCollectionFeedbackSender::kPasswordManagerURLCollectionBucket[] =
-    "ChromePasswordManagerFailure";
-
-URLCollectionFeedbackSender::URLCollectionFeedbackSender(
-    content::BrowserContext* context,
-    const std::string& url)
-    : context_(context), url_(url) {
-}
-
-void URLCollectionFeedbackSender::SendFeedback() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  scoped_refptr<FeedbackData> feedback_data = new FeedbackData();
-  feedback_data->set_category_tag(kPasswordManagerURLCollectionBucket);
-  feedback_data->set_description("");
-
-  feedback_data->set_image(make_scoped_ptr(new std::string));
-
-  feedback_data->set_page_url(url_);
-  feedback_data->set_user_email("");
-  feedback_data->set_context(context_);
-  feedback_util::SendReport(feedback_data);
+ScopedVector<const autofill::PasswordForm> DeepCopyForms(
+    const std::vector<const autofill::PasswordForm*>& forms) {
+  ScopedVector<const autofill::PasswordForm> result;
+  result.reserve(forms.size());
+  std::transform(forms.begin(), forms.end(), std::back_inserter(result),
+                 [](const autofill::PasswordForm* form) {
+    return new autofill::PasswordForm(*form);
+  });
+  return result.Pass();
 }
 
 }  // namespace
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       never_save_passwords_(false),
       display_disposition_(metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
   origin_ = controller->origin();
   state_ = controller->state();
   if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
     pending_password_ = controller->PendingPassword();
-    best_matches_ = controller->best_matches();
+    local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
+  } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
+    // We don't need anything.
   } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
-    local_pending_credentials_.swap(controller->local_credentials_forms());
-    federated_pending_credentials_.swap(
-        controller->federated_credentials_forms());
+    local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
+    federated_credentials_ = DeepCopyForms(controller->GetFederatedForms());
   } else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE) {
-    pending_password_ = *controller->local_credentials_forms()[0];
+    pending_password_ = *controller->GetCurrentForms()[0];
   } else {
-    best_matches_ = controller->best_matches();
+    local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
   }
 
   if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
     title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
   } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_BLACKLISTED_TITLE);
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
   } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
@@ skipping 53 matching lines @@
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   controller->OnBubbleShown();
 }
 
 void ManagePasswordsBubbleModel::OnBubbleHidden() {
   ManagePasswordsUIController* manage_passwords_ui_controller =
       web_contents() ?
           ManagePasswordsUIController::FromWebContents(web_contents())
           : nullptr;
-  if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE &&
-      manage_passwords_ui_controller) {
-    // It's time to run the pending callback if it wasn't called in
-    // OnChooseCredentials().
-    // TODO(vasilii): remove this. It's not a bubble's problem because the
-    // controller is notified anyway about closed bubble.
-    manage_passwords_ui_controller->ChooseCredential(
-        autofill::PasswordForm(),
-        password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
-    state_ = password_manager::ui::INACTIVE_STATE;
-  }
   if (manage_passwords_ui_controller)
     manage_passwords_ui_controller->OnBubbleHidden();
   if (dismissal_reason_ == metrics_util::NOT_DISPLAYED)
     return;
 
   metrics_util::LogUIDismissalReason(dismissal_reason_);
   // Other use cases have been reported in the callbacks like OnSaveClicked().
   if (state_ == password_manager::ui::PENDING_PASSWORD_STATE &&
       dismissal_reason_ == metrics_util::NO_DIRECT_INTERACTION)
     RecordExperimentStatistics(web_contents(), dismissal_reason_);
@@ skipping 97 matching lines @@
 
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }