Index: chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
diff --git a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
index 14386f40abe93d5f45a8ac9df7de1718d442b0c2..6fb621788f2ccb762c82b9f27445d7334f02069b 100644 |
--- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
+++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
@@ -56,8 +56,10 @@ class PasswordGenerationPopupControllerImpl |
virtual ~PasswordGenerationPopupControllerImpl(); |
// Create a PasswordGenerationPopupView if one doesn't already exist. |
- // Does not update the view if one is already showing. |
- void Show(); |
+ // If |display_password| is true, a generated password is shown that can be |
+ // selected by the user. Otherwise just the text explaining generated |
+ // passwords is shown. |
+ void Show(bool display_password); |
// Hides the popup and destroys |this|. |
void HideAndDestroy(); |
@@ -88,16 +90,19 @@ class PasswordGenerationPopupControllerImpl |
virtual void SelectionCleared() OVERRIDE; |
virtual bool ShouldRepostEvent(const ui::MouseEvent& event) OVERRIDE; |
virtual bool ShouldHideOnOutsideClick() const OVERRIDE; |
- virtual void OnHelpLinkClicked() OVERRIDE; |
+ virtual void OnSavedPasswordsLinkClicked() OVERRIDE; |
virtual gfx::NativeView container_view() OVERRIDE; |
+ virtual const gfx::FontList& font_list() const OVERRIDE; |
virtual const gfx::Rect& popup_bounds() const OVERRIDE; |
virtual const gfx::Rect& password_bounds() const OVERRIDE; |
virtual const gfx::Rect& divider_bounds() const OVERRIDE; |
virtual const gfx::Rect& help_bounds() const OVERRIDE; |
+ virtual bool display_password() const OVERRIDE; |
virtual bool password_selected() const OVERRIDE; |
virtual base::string16 password() const OVERRIDE; |
+ virtual base::string16 SuggestedText() OVERRIDE; |
virtual base::string16 HelpText() OVERRIDE; |
- virtual base::string16 LearnMoreLink() OVERRIDE; |
+ virtual base::string16 SavedPasswordsLink() OVERRIDE; |
base::WeakPtr<PasswordGenerationPopupControllerImpl> GetWeakPtr(); |
@@ -122,6 +127,7 @@ class PasswordGenerationPopupControllerImpl |
PasswordForm form_; |
PasswordGenerator* generator_; |
PasswordManager* password_manager_; |
+ // May be NULL. |
PasswordGenerationPopupObserver* observer_; |
// Contains common popup functionality. |
@@ -136,6 +142,9 @@ class PasswordGenerationPopupControllerImpl |
base::string16 current_password_; |
bool password_selected_; |
+ // If a password will be shown in this popup. |
+ bool display_password_; |
+ |
// Bounds for all the elements of the popup. |
gfx::Rect popup_bounds_; |
gfx::Rect password_bounds_; |