Make toolbar color opaque in browser theme

chrome/browser/themes/browser_theme_pack.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/themes/browser_theme_pack.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <limits>
@@ skipping 772 matching lines @@
   }
 
   return false;
 }
 
 bool BrowserThemePack::GetColor(int id, SkColor* color) const {
   if (colors_) {
     for (size_t i = 0; i < kColorTableLength; ++i) {
       if (colors_[i].id == id) {
         *color = colors_[i].color;
+        // The theme provider is intentionally made to ignore the alpha value of
+        // toolbar color, see crbug.com/618278.

[Peter Kasting, 2016/07/01 21:03:14]

Nit: Avoid referring to bugs in comments, and just give sufficient contet
inline; something like "Ignore alpha for the toolbar color, as we don't want to
allow transparent toolbars."

+        if (id == ThemeProperties::COLOR_TOOLBAR) {
+          *color = SkColorSetARGB(SK_AlphaOPAQUE, SkColorGetR(*color),
+                                  SkColorGetG(*color), SkColorGetB(*color));

[Peter Kasting, 2016/07/01 21:03:14]

Nit: Just:

  *color = SkColorSetA(*color, SK_AlphaOPAQUE);

+        }
         return true;
       }
     }
   }
 
   return false;
 }
 
 bool BrowserThemePack::GetDisplayProperty(int id, int* result) const {
   if (display_properties_) {
@@ skipping 734 matching lines @@
                                            false,
                                            &bitmap_data)) {
       NOTREACHED() << "Unable to encode theme image for prs_id="
                    << prs_id << " for scale_factor=" << scale_factors_[i];
       break;
     }
     image_memory_[scaled_raw_id] =
         base::RefCountedBytes::TakeVector(&bitmap_data);
   }
 }