This CL does the following: (1) Pass the max_length attribute to the password generator; (2) Update…

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2012 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/autofill/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 10 matching lines @@
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_feedback_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/form_structure.h"
+#include "chrome/browser/autofill/password_generator.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/autofill/select_control_handler.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 669 matching lines @@
           AutofillMetrics::SUGGESTIONS_SHOWN_ONCE);
     }
   }
 }
 
 void AutofillManager::OnHideAutofillPopup() {
   if (external_delegate_)
     external_delegate_->HideAutofillPopup();
 }
 
-void AutofillManager::OnShowPasswordGenerationPopup(const gfx::Rect& bounds) {
+void AutofillManager::OnShowPasswordGenerationPopup(const gfx::Rect& bounds,
+                                                    int max_length) {
 #if defined(OS_ANDROID)
   NOTIMPLEMENTED();
 #else
   Browser* browser = browser::FindLastActiveWithProfile(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
-  browser->window()->ShowPasswordGenerationBubble(bounds);
+  password_generator_.reset(new autofill::PasswordGenerator(max_length));
+  browser->window()->ShowPasswordGenerationBubble(
+      bounds, password_generator_.get());

[Ilya Sherman, 2012/06/04 22:52:32]

Is this bubble guaranteed to be hidden prior to the next call to
OnShowPasswordGenerationPopup()?  That is, is it actually safe for the
AutofillManager to free the old |password_generator_| as soon as a new bubble is
requested, or is it possible that an old bubble still needs the existing one?

[Garrett Casto, 2012/06/04 22:58:57]

At the moment the bubble is closed as soon as it loses focus, so this is safe.

 #endif  // #if defined(OS_ANDROID)
 }
 
 void AutofillManager::RemoveAutofillProfileOrCreditCard(int unique_id) {
   const std::vector<AutofillProfile*>& profiles = personal_data_->profiles();
   const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
   const AutofillProfile* profile = NULL;
   const CreditCard* credit_card = NULL;
   size_t variant = 0;
   if (!GetProfileOrCreditCard(unique_id, profiles, credit_cards, &profile,
@@ skipping 645 matching lines @@
   *profile_guid = IDToGUID(profile_id);
 }
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }