Invalidate Preferred Size On Combobox SizeToLargestLabel Changed

PermissionCombobox used ModelChanged() incorrectly to propagate a
change to the SizeToLargestLabel property. The real fix updates
Combobox to correctly invalidate the preferred size on such a
change and updates the method name in PermissionCombobox.

Fixed: 1116750
Change-Id: I5bc8f3efe292e94cbfc1c94a2a5149b8b1514da4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388889
Commit-Queue: Robert Liao <robliao@chromium.org>
Commit-Queue: Emily Stark <estark@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Auto-Submit: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803664}

chrome/browser/ui/views/page_info/permission_selector_row.cc

@@ -127,7 +127,7 @@ PermissionCombobox::PermissionCombobox(ComboboxModelAdapter* model,
   set_listener(this);
   SetEnabled(enabled);
   UpdateSelectedIndex(use_default);
-  set_size_to_largest_label(false);
+  SetSizeToLargestLabel(false);
 }
 
 PermissionCombobox::~PermissionCombobox() {}

ui/views/controls/combobox/combobox.cc

@@ -348,6 +348,15 @@ void Combobox::SetInvalid(bool invalid) {
   OnPropertyChanged(&selected_index_, kPropertyEffectsPaint);
 }
 
+void Combobox::SetSizeToLargestLabel(bool size_to_largest_label) {
+  if (size_to_largest_label_ == size_to_largest_label)
+    return;
+
+  size_to_largest_label_ = size_to_largest_label;
+  content_size_ = GetContentSize();
+  OnPropertyChanged(&selected_index_, kPropertyEffectsPreferredSizeChanged);
+}
+
 void Combobox::OnThemeChanged() {
   View::OnThemeChanged();
   SetBackground(
@@ -708,6 +717,7 @@ PrefixSelector* Combobox::GetPrefixSelector() {
 BEGIN_METADATA(Combobox, View)
 ADD_PROPERTY_METADATA(int, SelectedIndex)
 ADD_PROPERTY_METADATA(bool, Invalid)
+ADD_PROPERTY_METADATA(bool, SizeToLargestLabel)
 ADD_PROPERTY_METADATA(base::string16, AccessibleName)
 END_METADATA
 

ui/views/controls/combobox/combobox.h

@@ -92,6 +92,10 @@ class VIEWS_EXPORT Combobox : public View,
   void SetInvalid(bool invalid);
   bool GetInvalid() const { return invalid_; }
 
+  // Whether the combobox should use the largest label as the content size.
+  void SetSizeToLargestLabel(bool size_to_largest_label);
+  bool GetSizeToLargestLabel() const { return size_to_largest_label_; }
+
   // Overridden from View:
   gfx::Size CalculatePreferredSize() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
@@ -114,10 +118,6 @@ class VIEWS_EXPORT Combobox : public View,
   void ButtonPressed(Button* sender, const ui::Event& event) override;
 
  protected:
-  void set_size_to_largest_label(bool size_to_largest_label) {
-    size_to_largest_label_ = size_to_largest_label;
-  }
-
   // Overridden from ComboboxModelObserver:
   void OnComboboxModelChanged(ui::ComboboxModel* model) override;