[Password Generation] Update UI to match final mocks.

chrome/browser/ui/autofill/password_generation_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
 // popup is active, and notifying both the renderer and the password manager
 // if the password is accepted.
 class PasswordGenerationPopupControllerImpl
     : public PasswordGenerationPopupController {
  public:
   // Create a controller or return |previous| if it is suitable. Will hide
   // |previous| if it is not returned. |bounds| is the bounds of the element
   // that we are showing the dropdown for in screen space. |form| is the
   // identifier for the form that we are filling, and is used to notify
   // |password_manager| if the password is generated. |generator| is used to
-  // create the password shown. If not NULL, |observer| will be notified of
-  // changes of the popup state.
+  // create the password shown. These three parameters may be NULL if a
+  // generated password won't be suggested. If not NULL, |observer| will be
+  // notified of changes of the popup state.
   static base::WeakPtr<PasswordGenerationPopupControllerImpl> GetOrCreate(
       base::WeakPtr<PasswordGenerationPopupControllerImpl> previous,
       const gfx::RectF& bounds,
-      const PasswordForm& form,
+      const PasswordForm* form,
       PasswordGenerator* generator,
       PasswordManager* password_manager,
       PasswordGenerationPopupObserver* observer,
       content::WebContents* web_contents,
       gfx::NativeView container_view);
   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();
 
+  // Setters
+  void set_form(const PasswordForm* form) { form_ = form; }

[Evan Stade, 2014/02/07 21:45:48]

why are these public? why do you need them at all?

[Garrett Casto, 2014/02/10 11:02:44]

They were there because in the editing form of the UI you don't actually need
any of these elements. For cleanliness of this interface I've removed them and
given non-NULL references even Show() is called with display = false. We can
know the the values these should take even if we don't intend to use them.

+  void set_generator(PasswordGenerator* generator) { generator_ = generator; }
+  void set_password_manager(PasswordManager* password_manager) {
+    password_manager_ = password_manager;
+  }
+
+
   // Accessors.
   content::WebContents* web_contents() {
     return controller_common_.web_contents();
   }
   const gfx::RectF& element_bounds() {
     return controller_common_.element_bounds();
   }
 
  private:
   PasswordGenerationPopupControllerImpl(
       const gfx::RectF& bounds,
-      const PasswordForm& form,
+      const PasswordForm* form,
       PasswordGenerator* generator,
       PasswordManager* password_manager,
       PasswordGenerationPopupObserver* observer,
       content::WebContents* web_contents,
       gfx::NativeView container_view);
 
   // PasswordGenerationPopupController implementation:
   virtual void Hide() OVERRIDE;
   virtual void ViewDestroyed() OVERRIDE;
   virtual void SetSelectionAtPoint(const gfx::Point& point) OVERRIDE;
   virtual void AcceptSelectionAtPoint(const gfx::Point& point) OVERRIDE;
   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();
 
   bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event);
 
   // Set if the password is currently selected.
   void PasswordSelected(bool selected);
 
   // Accept the password. Causes the controller to hide itself as the popup
   // is no longer necessary.
   void PasswordAccepted();
 
   // Accept password if it's selected.
   bool PossiblyAcceptPassword();
 
   // Get desired size of popup. Height depends on width because we do text
   // wrapping.
   int GetDesiredWidth();
   int GetDesiredHeight(int width);
   void CalculateBounds();
 
-  PasswordForm form_;
+  // These members may be NULL.
+  const PasswordForm* form_;

[Evan Stade, 2014/02/07 21:45:48]

why can this be null?

[Garrett Casto, 2014/02/10 11:02:44]

N/A now, but if a password isn't displayed this value isn't used.

   PasswordGenerator* generator_;
   PasswordManager* password_manager_;
   PasswordGenerationPopupObserver* observer_;
 
   // Contains common popup functionality.
   PopupControllerCommon controller_common_;
 
   // Handle to the popup. May be NULL if popup isn't showing.
   PasswordGenerationPopupView* view_;
 
   // Font list used in the popup.
   gfx::FontList font_list_;
 
   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_;
   gfx::Rect divider_bounds_;
   gfx::Rect help_bounds_;
 
   base::WeakPtrFactory<PasswordGenerationPopupControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordGenerationPopupControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_