Renamed AppMenuBadgeController to AppMenuIconController

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 19 matching lines @@
 #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),
-      type_(AppMenuBadgeController::BadgeType::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())
     icon_painter_.reset(new AppMenuIconPainter(this));
 }
 
 AppMenuButton::~AppMenuButton() {}
 
-void AppMenuButton::SetSeverity(AppMenuBadgeController::BadgeType type,
+void AppMenuButton::SetSeverity(AppMenuIconController::IconType type,
                                 AppMenuIconPainter::Severity severity,
                                 bool animate) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     severity_ = severity;
     type_ = type;
     UpdateIcon();
     return;
   }
 
   icon_painter_->SetSeverity(severity, animate);
@@ skipping 84 matching lines @@
     case AppMenuIconPainter::SEVERITY_MEDIUM:
       color = gfx::kGoogleYellow700;
       break;
     case AppMenuIconPainter::SEVERITY_HIGH:
       color = gfx::kGoogleRed700;
       break;
   }
 
   gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   switch (type_) {
-    case AppMenuBadgeController::BadgeType::NONE:
+    case AppMenuIconController::IconType::NONE:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS;
       DCHECK_EQ(severity_, AppMenuIconPainter::SEVERITY_NONE);
       break;
-    case AppMenuBadgeController::BadgeType::UPGRADE_NOTIFICATION:
+    case AppMenuIconController::IconType::UPGRADE_NOTIFICATION:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS_UPDATE;
       break;
-    case AppMenuBadgeController::BadgeType::GLOBAL_ERROR:
+    case AppMenuIconController::IconType::GLOBAL_ERROR:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS_ERROR;
       break;
-    case AppMenuBadgeController::BadgeType::INCOMPATIBILITY_WARNING:
+    case AppMenuIconController::IconType::INCOMPATIBILITY_WARNING:
       icon_id = gfx::VectorIconId::BROWSER_TOOLS_WARNING;
       break;
   }
 
   SetImage(views::Button::STATE_NORMAL, gfx::CreateVectorIcon(icon_id, color));
 }
 
 void AppMenuButton::SetTrailingMargin(int margin) {
   margin_trailing_ = margin;
 
@@ skipping 86 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);
 }