MD - Use real comboboxes in website settings popup. Hide borders (but

ui/views/controls/combobox/combobox.h

 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 87 matching lines @@
 
   // Overridden from PrefixDelegate:
   int GetRowCount() override;
   int GetSelectedRow() override;
   void SetSelectedRow(int row) override;
   base::string16 GetTextForRow(int row) override;
 
   // Overriden from ButtonListener:
   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;

[sky, 2016/06/16 21:58:55]

Why do you need to change this? It makes sense for STYLE_ACTION because the
selected index effectively never changes. Is that the case with permissions?

[Evan Stade, 2016/06/16 22:04:32]

We're getting rid of the border, and it just looks weird to have the arrow
hanging way off to the right (due to some extra-long label that's not selected
and not currently visible). It looks much better right next to the text, even if
it does move when you select a longer or shorter option.

+  }
+
  private:
   friend class test::ComboboxTestApi;
 
   class ComboboxMenuModelAdapter;
 
   // Updates the border according to the current state.
   void UpdateBorder();
 
   // Given bounds within our View, this helper mirrors the bounds if necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
@@ skipping 79 matching lines @@
   CustomButton* text_button_;
   CustomButton* arrow_button_;
 
   // Set while the dropdown is showing. Ensures the menu is closed if |this| is
   // destroyed.
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   // The image to be drawn for this combobox's arrow.
   gfx::ImageSkia arrow_image_;
 
+  // When true, the size of contents is defined by the selected label.
+  // Otherwise, it's defined by the widest label in the menu.
+  bool size_to_largest_label_;
+
   // Used for making calbacks.
   base::WeakPtrFactory<Combobox> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_