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 5507fd36e136eb91cb1053316773f0b9b5ea0796..dd733e39431f291d1c7a4511fcc2f4e22c5f39eb 100644 |
--- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
+++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h |
@@ -12,7 +12,6 @@ |
#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" |
@@ -92,12 +91,9 @@ class PasswordGenerationPopupControllerImpl |
virtual bool AcceptSelectedLine() OVERRIDE; |
virtual void SelectionCleared() OVERRIDE; |
virtual void OnSavedPasswordsLinkClicked() OVERRIDE; |
+ virtual int GetMinimumWidth() 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; |
@@ -121,8 +117,6 @@ class PasswordGenerationPopupControllerImpl |
// Get desired size of popup. Height depends on width because we do text |
// wrapping. |
- int GetDesiredWidth(); |
- int GetDesiredHeight(int width); |
void CalculateBounds(); |
PasswordForm form_; |
@@ -140,9 +134,6 @@ class PasswordGenerationPopupControllerImpl |
// Handle to the popup. May be NULL if popup isn't showing. |
PasswordGenerationPopupView* view_; |
- // Font list used in the popup. |
- const gfx::FontList& font_list_; |
- |
// Help text and the range in the text that corresponds to the saved passwords |
// link. |
base::string16 help_text_; |
@@ -156,9 +147,6 @@ class PasswordGenerationPopupControllerImpl |
// 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_; |