[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"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller.h"
 #include "chrome/browser/ui/autofill/popup_controller_common.h"
 #include "components/autofill/core/common/password_form.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 
 namespace content {
 struct NativeWebKeyboardEvent;
 class WebContents;
 }
 
 class PasswordManager;
 
@@ skipping 22 matching lines @@
       const gfx::RectF& bounds,
       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();
 
   // Accessors.
   content::WebContents* web_contents() {
     return controller_common_.web_contents();
   }
   const gfx::RectF& element_bounds() {
     return controller_common_.element_bounds();
@@ skipping 10 matching lines @@
       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 HelpText() OVERRIDE;
-  virtual base::string16 LearnMoreLink() OVERRIDE;
+  virtual base::string16 SuggestedText() OVERRIDE;
+  virtual const base::string16& HelpText() OVERRIDE;
+  virtual const gfx::Range& HelpTextLinkRange() 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_;
   PasswordGenerator* generator_;
   PasswordManager* password_manager_;
+  // May be NULL.
   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_;
+  const gfx::FontList& font_list_;
+
+  // Help text and the range in the text that corresponds to the saved passwords
+  // link.
+  base::string16 help_text_;
+  gfx::Range link_range_;
 
   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_