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

chrome/browser/ui/views/toolbar/app_menu_button.cc

 // Copyright 2013 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/toolbar/app_menu_button.h"
 
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 26 matching lines @@
 AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)
     : views::MenuButton(base::string16(), toolbar_view, false),
       severity_(AppMenuIconPainter::SEVERITY_NONE),
       type_(AppMenuIconController::IconType::NONE),
       toolbar_view_(toolbar_view),
       allow_extension_dragging_(
           extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
       margin_trailing_(0),
       weak_factory_(this) {
   SetHasInkDrop(true);
-  if (!ui::MaterialDesignController::IsModeMaterial())
+  if (ui::MaterialDesignController::IsModeMaterial())
+    SetFocusPainter(nullptr);
+  else
     icon_painter_.reset(new AppMenuIconPainter(this));
 }
 
 AppMenuButton::~AppMenuButton() {}
 
 void AppMenuButton::SetSeverity(AppMenuIconController::IconType type,
                                 AppMenuIconPainter::Severity severity,
                                 bool animate) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     severity_ = severity;
@@ skipping 207 matching lines @@
   views::MenuButton::OnPaint(canvas);
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
   // Use GetPreferredSize() to center the icon inside the visible bounds rather
   // than the whole size() (which may refer to hit test region extended to the
   // end of the toolbar in maximized mode).
   icon_painter_->Paint(canvas, GetThemeProvider(),
                        gfx::Rect(GetPreferredSize()),
                        AppMenuIconPainter::BEZEL_NONE);
 }