Ignore alpha value in extension-specified badge bg color.

chrome/browser/ui/extensions/icon_with_badge_image_source.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/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 150 matching lines @@
 void IconWithBadgeImageSource::PaintBadge(gfx::Canvas* canvas) {
   if (!badge_ || badge_->text.empty())
     return;
 
   SkColor text_color = SkColorGetA(badge_->text_color) == SK_AlphaTRANSPARENT
                            ? SK_ColorWHITE
                            : badge_->text_color;
 
   SkColor background_color = ui::MaterialDesignController::IsModeMaterial()
                                  ? gfx::kGoogleBlue500
-                                 : SkColorSetARGB(255, 218, 0, 24);
+                                 : SkColorSetRGB(218, 0, 24);
   if (SkColorGetA(badge_->background_color) != SK_AlphaTRANSPARENT)
     background_color = badge_->background_color;
+  // Make sure the background color is opaque. See http://crbug.com/619499
+  if (ui::MaterialDesignController::IsModeMaterial())
+    background_color = SkColorSetA(background_color, SK_AlphaOPAQUE);
 
   canvas->Save();
 
   SkPaint* text_paint = nullptr;
   int text_width = 0;
   ResourceBundle* rb = &ResourceBundle::GetSharedInstance();
   gfx::FontList base_font = rb->GetFontList(ResourceBundle::BaseFont)
                                 .DeriveWithHeightUpperBound(kBadgeHeight);
   base::string16 utf16_text = base::UTF8ToUTF16(badge_->text);
 
@@ skipping 122 matching lines @@
 }
 
 void IconWithBadgeImageSource::PaintBlockedActionDecoration(
     gfx::Canvas* canvas) {
   canvas->Save();
   gfx::ImageSkia img = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BLOCKED_EXTENSION_SCRIPT);
   canvas->DrawImageInt(img, size().width() - img.width(), 0);
   canvas->Restore();
 }