PermissionSelectorView: use Combobox on MacViews builds.

chrome/browser/ui/views/website_settings/permission_selector_view.h

Index: chrome/browser/ui/views/website_settings/permission_selector_view.h
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h
index 8ad03efa0789634b423bef0276156821dbd5953b..0be9e5561a6705f1e3c56fc32a1b6445f0f5a2a3 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.h
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h
@@ -20,10 +20,13 @@
 #include "ui/views/view.h"
 
 namespace internal {
+class ComboboxModelAdapter;
+class PermissionCombobox;
 class PermissionMenuButton;
 }
 
 namespace views {
+class GridLayout;
 class ImageView;
 class MenuRunner;
 }
@@ -46,11 +49,18 @@ class PermissionSelectorView : public views::View {
  private:
   ~PermissionSelectorView() override;
 
+  void InitializeMenuButtonView(views::GridLayout* layout,
+                                const WebsiteSettingsUI::PermissionInfo& perm);

[palmer, 2016/05/25 18:34:39]

Nit: Identifiers in interfaces should be full words. You could go with |info|
(promoted to a 'full word' by convention, I suppose; but that is something).

[Elly Fong-Jones, 2016/05/26 13:40:38]

Done.

+  void InitializeComboboxView(views::GridLayout* layout,
+                              const WebsiteSettingsUI::PermissionInfo& perm);
+
   // Model for the permission's menu.
   std::unique_ptr<PermissionMenuModel> menu_model_;
+  std::unique_ptr<internal::ComboboxModelAdapter> combobox_model_adaptor_;

[palmer, 2016/05/25 18:34:39]

Nit: Standardize on "adaptor" vs. "adapter". Since
|internal::ComboboxModelAdapter| is already established, I'd go with -er.

[Elly Fong-Jones, 2016/05/26 13:40:38]

Done.

 
   views::ImageView* icon_;  // Owned by the views hierachy.
   internal::PermissionMenuButton* menu_button_;  // Owned by the views hierachy.
+  internal::PermissionCombobox* combobox_;  // Owned by the views heirarchy.

[palmer, 2016/05/25 18:34:39]

Nit: Typo: "hierarchy"

[Elly Fong-Jones, 2016/05/26 13:40:38]

Done.

 
   base::ObserverList<PermissionSelectorViewObserver, false> observer_list_;