PermissionSelectorView: use Combobox on MacViews builds.

chrome/browser/ui/views/website_settings/permission_selector_view.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 CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 namespace internal {
+class ComboboxModelAdapter;
+class PermissionCombobox;
 class PermissionMenuButton;
 }
 
 namespace views {
+class GridLayout;
 class ImageView;
 class MenuRunner;
 }
 
 // A custom view for selecting a permission setting for the given permission
 // |type|.
 class PermissionSelectorView : public views::View {
  public:
   PermissionSelectorView(const GURL& url,
                          const WebsiteSettingsUI::PermissionInfo& permission);
 
   void AddObserver(PermissionSelectorViewObserver* observer);
 
   void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission);
 
  protected:
   // Overridden from views::View.
   void ChildPreferredSizeChanged(View* child) override;
 
  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_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_