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

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

 // 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.
 
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
@@ skipping 147 matching lines @@
  public:
   PermissionCombobox(const base::string16& text,
                      ComboboxModelAdapter* model,
                      bool enabled,
                      bool use_default);
   ~PermissionCombobox() override;
 
   void UpdateSelectedIndex(bool use_default);
 
  private:
+  // views::Combobox:
+  void OnPaintBorder(gfx::Canvas* canvas) override;
+
   // views::ComboboxListener:
   void OnPerformAction(Combobox* combobox) override;
 
   ComboboxModelAdapter* model_;
 };
 
 PermissionCombobox::PermissionCombobox(const base::string16& text,
                                        ComboboxModelAdapter* model,
                                        bool enabled,
                                        bool use_default)
     : views::Combobox(model), model_(model) {
   set_listener(this);
   SetEnabled(enabled);
   UpdateSelectedIndex(use_default);
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    set_size_to_largest_label(false);
+    ModelChanged();
+  }
 }
 
 PermissionCombobox::~PermissionCombobox() {}
 
 void PermissionCombobox::UpdateSelectedIndex(bool use_default) {
   int index = model_->GetCheckedIndex();
   if (use_default && index == -1)
     index = 0;
   SetSelectedIndex(index);
 }
 
+void PermissionCombobox::OnPaintBorder(gfx::Canvas* canvas) {
+  // No border except a focus indicator for MD mode.
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial() && !HasFocus())
+    return;
+  Combobox::OnPaintBorder(canvas);
+}
+
 void PermissionCombobox::OnPerformAction(Combobox* combobox) {
   model_->OnPerformAction(combobox->selected_index());
 }
 
 }  // namespace internal
 
 ///////////////////////////////////////////////////////////////////////////////
 // PermissionSelectorView
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 43 matching lines @@
                   1,
                   1,
                   views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
   // Create the menu model.
   menu_model_.reset(new PermissionMenuModel(
       url,
       permission,
       base::Bind(&PermissionSelectorView::PermissionChanged,
                  base::Unretained(this))));
+
   // Create the permission menu button.
 #if defined(OS_MACOSX)
-  InitializeComboboxView(layout, permission);
+  bool use_real_combobox = true;
 #else
-  InitializeMenuButtonView(layout, permission);
+  bool use_real_combobox =
+      ui::MaterialDesignController::IsSecondaryUiMaterial();
 #endif
+  if (use_real_combobox)
+    InitializeComboboxView(layout, permission);
+  else
+    InitializeMenuButtonView(layout, permission);
 }
 
 void PermissionSelectorView::AddObserver(
     PermissionSelectorViewObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void PermissionSelectorView::ChildPreferredSizeChanged(View* child) {
   SizeToPreferredSize();
   // FIXME: The parent is only a plain |View| that is used as a
@@ skipping 67 matching lines @@
     menu_button_->SizeToPreferredSize();
   } else if (combobox_) {
     bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
     combobox_->UpdateSelectedIndex(use_default);
   }
 
   FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
                     observer_list_,
                     OnPermissionChanged(permission));
 }