Remove a bunch of pre-MD toolbar code and assets.

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"
 #include "base/time/time.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/theme_resources.h"
 #include "extensions/common/feature_switch.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/menu/menu_listener.h"
 #include "ui/views/metrics.h"
-#include "ui/views/painter.h"
 
 // static
 bool AppMenuButton::g_open_app_immediately_for_testing = false;
 
 AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)
     : views::MenuButton(base::string16(), toolbar_view, false),
-      severity_(AppMenuIconPainter::SEVERITY_NONE),
+      severity_(AppMenuIconController::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) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    SetInkDropMode(InkDropMode::ON);
-    SetFocusPainter(nullptr);
-  } else {
-    icon_painter_.reset(new AppMenuIconPainter(this));
-  }
+  SetInkDropMode(InkDropMode::ON);
+  SetFocusPainter(nullptr);
 }
 
 AppMenuButton::~AppMenuButton() {}
 
 void AppMenuButton::SetSeverity(AppMenuIconController::IconType type,
-                                AppMenuIconPainter::Severity severity,
+                                AppMenuIconController::Severity severity,
                                 bool animate) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    severity_ = severity;
-    type_ = type;
-    UpdateIcon();
-    return;
-  }
-
-  icon_painter_->SetSeverity(severity, animate);
-  SchedulePaint();
+  severity_ = severity;
+  type_ = type;

[Peter Kasting, 2016/09/27 20:51:08]

Tiny nit: This assignment order matches member declaration order but not
function arg declaration order... would be kinda nice if these matched (and if
the function name said it was setting the type, not just the severity)

[Evan Stade, 2016/09/28 01:33:50]

done

+  UpdateIcon();
 }
 
 void AppMenuButton::ShowMenu(bool for_drop) {
   if (menu_ && menu_->IsShowing())
     return;
 
 #if defined(USE_AURA)
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller && keyboard_controller->keyboard_visible()) {
@@ skipping 34 matching lines @@
 
 void AppMenuButton::AddMenuListener(views::MenuListener* listener) {
   menu_listeners_.AddObserver(listener);
 }
 
 void AppMenuButton::RemoveMenuListener(views::MenuListener* listener) {
   menu_listeners_.RemoveObserver(listener);
 }
 
 gfx::Size AppMenuButton::GetPreferredSize() const {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    gfx::Size size(image()->GetPreferredSize());
-    const ui::ThemeProvider* provider = GetThemeProvider();
-    if (provider) {

[Peter Kasting, 2016/09/27 20:51:09]

Why did we used to check the theme provider?

[Evan Stade, 2016/09/28 01:33:49]

it used to be provider && provider->IsUsingSystemTheme(). We removed the latter
check but the former for some reason persisted (an oversight  I assume).

-      gfx::Insets insets(GetLayoutInsets(TOOLBAR_BUTTON));
-      size.Enlarge(insets.width(), insets.height());
-    }
-    return size;
-  }
-
-  return ResourceBundle::GetSharedInstance().
-      GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
-}
-
-void AppMenuButton::ScheduleAppMenuIconPaint() {
-  SchedulePaint();
+  gfx::Size size(image()->GetPreferredSize());
+  gfx::Insets insets(GetLayoutInsets(TOOLBAR_BUTTON));
+  size.Enlarge(insets.width(), insets.height());
+  return size;
 }
 
 void AppMenuButton::UpdateIcon() {
-  DCHECK(ui::MaterialDesignController::IsModeMaterial());
   SkColor color = gfx::kPlaceholderColor;
   const ui::NativeTheme* native_theme = GetNativeTheme();
   switch (severity_) {
-    case AppMenuIconPainter::SEVERITY_NONE:
+    case AppMenuIconController::Severity::NONE:
       color = GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
       break;
-    case AppMenuIconPainter::SEVERITY_LOW:
+    case AppMenuIconController::Severity::LOW:
       color = native_theme->GetSystemColor(
           ui::NativeTheme::kColorId_AlertSeverityLow);
       break;
-    case AppMenuIconPainter::SEVERITY_MEDIUM:
+    case AppMenuIconController::Severity::MEDIUM:
       color = native_theme->GetSystemColor(
           ui::NativeTheme::kColorId_AlertSeverityMedium);
       break;
-    case AppMenuIconPainter::SEVERITY_HIGH:
+    case AppMenuIconController::Severity::HIGH:
       color = native_theme->GetSystemColor(
           ui::NativeTheme::kColorId_AlertSeverityHigh);
       break;
   }
 
   gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   switch (type_) {
     case AppMenuIconController::IconType::NONE:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS;
-      DCHECK_EQ(severity_, AppMenuIconPainter::SEVERITY_NONE);
+      DCHECK_EQ(severity_, AppMenuIconController::Severity::NONE);

[Peter Kasting, 2016/09/27 20:51:09]

Nit: (expected, actual)

[Evan Stade, 2016/09/28 01:33:49]

Done.

       break;
     case AppMenuIconController::IconType::UPGRADE_NOTIFICATION:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS_UPDATE;
       break;
     case AppMenuIconController::IconType::GLOBAL_ERROR:
     case AppMenuIconController::IconType::INCOMPATIBILITY_WARNING:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS_ERROR;
       break;
   }
 
   SetImage(views::Button::STATE_NORMAL, gfx::CreateVectorIcon(icon_id, color));
 }
 
 void AppMenuButton::SetTrailingMargin(int margin) {
   margin_trailing_ = margin;
-
   UpdateThemedBorder();
-
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    const int inset = LabelButton::kFocusRectInset;
-    SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets(
-        gfx::Insets(inset, inset, inset, inset + margin)));
-  }
-
   InvalidateLayout();
 }
 
 const char* AppMenuButton::GetClassName() const {
   return "AppMenuButton";
 }
 
 std::unique_ptr<views::LabelButtonBorder> AppMenuButton::CreateDefaultBorder()
     const {
   std::unique_ptr<views::LabelButtonBorder> border =
@@ skipping 56 matching lines @@
 
 void AppMenuButton::OnDragExited() {
   DCHECK(allow_extension_dragging_);
   weak_factory_.InvalidateWeakPtrs();
 }
 
 int AppMenuButton::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(allow_extension_dragging_);
   return ui::DragDropTypes::DRAG_MOVE;
 }
-
-void AppMenuButton::OnPaint(gfx::Canvas* canvas) {
-  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);
-}