| Index: chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| index ddadf147d75c72158be4c23b2faafb61a5af3c70..3e88bfd096d67b5beda9fe0f8b6a72683a1a9894 100644
|
| --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| @@ -98,8 +98,8 @@ class AutofillDialogViews : public AutofillDialogView,
|
| virtual void ValidateSection(DialogSection section) OVERRIDE;
|
|
|
| // views::View implementation.
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| - virtual gfx::Size GetMinimumSize() OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| + virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
|
|
|
| @@ -259,7 +259,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| void SetNotifications(const std::vector<DialogNotification>& notifications);
|
|
|
| // views::View implementation.
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| virtual const char* GetClassName() const OVERRIDE;
|
| virtual void PaintChildren(gfx::Canvas* canvas,
|
| const views::CullSet& cull_set) OVERRIDE;
|
| @@ -340,7 +340,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| virtual ~SuggestedButton();
|
|
|
| // views::MenuButton implementation.
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| virtual const char* GetClassName() const OVERRIDE;
|
| virtual void PaintChildren(gfx::Canvas* canvas,
|
| const views::CullSet& cull_set) OVERRIDE;
|
| @@ -386,8 +386,8 @@ class AutofillDialogViews : public AutofillDialogView,
|
| void SetState(const SuggestionState& state);
|
|
|
| // views::View implementation.
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| - virtual int GetHeightForWidth(int width) OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| + virtual int GetHeightForWidth(int width) const OVERRIDE;
|
| virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
|
|
|
| ExpandingTextfield* textfield() { return textfield_; }
|
| @@ -399,7 +399,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| // |vertically_compact_text| or |horizontally_compact_text| as the case may
|
| // be.
|
| bool CanUseVerticallyCompactText(int available_width,
|
| - int* resulting_height);
|
| + int* resulting_height) const;
|
|
|
| // Sets the display text of the suggestion.
|
| void SetLabelText(const base::string16& text);
|
| @@ -420,7 +420,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
|
|
| // This caches preferred heights for given widths. The key is a preferred
|
| // width, the value is a cached result of CanUseVerticallyCompactText.
|
| - std::map<int, std::pair<bool, int> > calculated_heights_;
|
| + mutable std::map<int, std::pair<bool, int> > calculated_heights_;
|
|
|
| // The label that holds the suggestion description text.
|
| views::Label* label_;
|
| @@ -460,7 +460,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| typedef std::map<DialogSection, DetailsGroup> DetailGroupMap;
|
|
|
| // Returns the preferred size or minimum size (if |get_minimum_size| is true).
|
| - gfx::Size CalculatePreferredSize(bool get_minimum_size);
|
| + gfx::Size CalculatePreferredSize(bool get_minimum_size) const;
|
|
|
| // Returns the minimum size of the sign in view for this dialog.
|
| gfx::Size GetMinimumSignInViewSize() const;
|
| @@ -592,7 +592,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| AutofillDialogViewDelegate* const delegate_;
|
|
|
| // The preferred size of the view, cached to avoid needless recomputation.
|
| - gfx::Size preferred_size_;
|
| + mutable gfx::Size preferred_size_;
|
|
|
| // The current number of unmatched calls to UpdatesStarted.
|
| int updates_scope_;
|
|
|