Integrate new MD update menu icons.

chrome/browser/ui/views/toolbar/toolbar_view.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/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 640 matching lines @@
                                       bool animate) {
   // There's no app menu in tabless windows.
   if (!app_menu_button_)
     return;
 
   // Showing the bubble requires |app_menu_button_| to be in a widget. See
   // comment in ConflictingModuleView for details.
   DCHECK(app_menu_button_->GetWidget());
 
   base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP);
-  if (type == AppMenuBadgeController::BADGE_TYPE_UPGRADE_NOTIFICATION) {
+  if (type == AppMenuBadgeController::BadgeType::UPGRADE_NOTIFICATION) {
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_button_->SetAccessibleName(accname_app);
-  app_menu_button_->SetSeverity(severity, animate);
+  app_menu_button_->SetSeverity(type, severity, animate);
 
   // Keep track of whether we were showing the badge before, so we don't send
   // multiple UMA events for example when multiple Chrome windows are open.
   static bool incompatibility_badge_showing = false;
   // Save the old value before resetting it.
   bool was_showing = incompatibility_badge_showing;
   incompatibility_badge_showing = false;
 
-  if (type == AppMenuBadgeController::BADGE_TYPE_INCOMPATIBILITY_WARNING) {
+  if (type == AppMenuBadgeController::BadgeType::INCOMPATIBILITY_WARNING) {
     if (!was_showing) {
       content::RecordAction(UserMetricsAction("ConflictBadge"));
 #if defined(OS_WIN)
       ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
 #endif
     }
     incompatibility_badge_showing = true;
     return;
   }
 }
@@ skipping 110 matching lines @@
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
 #if defined(USE_ASH)
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
 #else
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
 #endif
 }