diff options
| -rw-r--r-- | chrome/browser/browser_theme_provider.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/browser_theme_provider_unittest.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index be81770..aceedf1 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -1112,9 +1112,9 @@ void BrowserThemeProvider::SetColorData(DictionaryValue* colors_value) { colors_[WideToUTF8(*iter)] = SkColorSetARGB(static_cast<int>(alpha * 255), r, g, b); } else if (color_list->GetInteger(3, &alpha_int) && - (alpha_int >= 0 && alpha_int <= 255)) { + (alpha_int == 0 || alpha_int == 1)) { colors_[WideToUTF8(*iter)] = - SkColorSetARGB(alpha_int, r, g, b); + SkColorSetARGB(alpha_int ? 255 : 0, r, g, b); } } else { colors_[WideToUTF8(*iter)] = SkColorSetRGB(r, g, b); diff --git a/chrome/browser/browser_theme_provider_unittest.cc b/chrome/browser/browser_theme_provider_unittest.cc index 503c9e4..6556a56 100644 --- a/chrome/browser/browser_theme_provider_unittest.cc +++ b/chrome/browser/browser_theme_provider_unittest.cc @@ -141,12 +141,12 @@ TEST_F(BrowserThemeProviderTest, ColorSanityCheck) { TEST_F(BrowserThemeProviderTest, DeriveUnderlineLinkColor) { // If we specify a link color, but don't specify the underline color, the // theme provider should create one. - std::string color_json = "{ \"ntp_link\": [128, 128, 128, 126]," - " \"ntp_section_link\": [128, 128, 128, 126] }"; + std::string color_json = "{ \"ntp_link\": [128, 128, 128, 1]," + " \"ntp_section_link\": [128, 128, 128, 1] }"; LoadColorJSON(color_json); std::map<int, SkColor> colors = GetDefaultColorMap(); - SkColor link_color = SkColorSetARGB(126, 128, 128, 128); + SkColor link_color = SkColorSetARGB(255, 128, 128, 128); colors[BrowserThemeProvider::COLOR_NTP_LINK] = link_color; colors[BrowserThemeProvider::COLOR_NTP_LINK_UNDERLINE] = BuildThirdOpacity(link_color); |