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);
+  scoped_ptr<autofill::PasswordGenerator> password_generator(
+      new autofill::PasswordGenerator(max_length));

[Ilya Sherman, 2012/06/01 01:09:55]

This will be deleted immediately at the end of the function, which is probably
not what you wanted, right?  If that's not a problem, I would skip the
heap-allocation and just declare the PasswordGenerator on the stack.

[zysxqn, 2012/06/01 19:01:32]

I don't think it's a problem here. Only when user click the generation icon on
the password form again do we need to re-show the bubble and re-generate the
password, and this will be done by create a new bubble and a new password
generator.

Changed to stack allocation.

[Garrett Casto, 2012/06/01 20:02:02]

I don't think that either of these solutions is really what you want. The only
reason that this happens to work right now is that we are generating the
password in the constructor. When we add the button to regenerate passwords this
is going to segfault. Either you shouldn't store the PasswordGenerator as a
member variable, or you should heap allocate here and grab with a scoped_ptr in
the bubbles. I prefer the latter since I think that we are going to want the
ability to regenerate passwords eventually.

[zysxqn, 2012/06/01 22:32:54]

Done.

+  browser->window()->ShowPasswordGenerationBubble(
+      bounds, password_generator.get());
 #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;
   }
 }