| Index: chrome/browser/themes/browser_theme_pack.cc
|
| diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
|
| index 1c7d6491dab79b4b76c233057dcecfba89ef83e3..90011ab7ad9038592cbe95516e7fed9686238e07 100644
|
| --- a/chrome/browser/themes/browser_theme_pack.cc
|
| +++ b/chrome/browser/themes/browser_theme_pack.cc
|
| @@ -235,13 +235,8 @@ const StringToIntTable kColorTable[] = {
|
| { "ntp_background", ThemeProperties::COLOR_NTP_BACKGROUND },
|
| { "ntp_text", ThemeProperties::COLOR_NTP_TEXT },
|
| { "ntp_link", ThemeProperties::COLOR_NTP_LINK },
|
| - { "ntp_link_underline", ThemeProperties::COLOR_NTP_LINK_UNDERLINE },
|
| { "ntp_header", ThemeProperties::COLOR_NTP_HEADER },
|
| { "ntp_section", ThemeProperties::COLOR_NTP_SECTION },
|
| - { "ntp_section_text", ThemeProperties::COLOR_NTP_SECTION_TEXT },
|
| - { "ntp_section_link", ThemeProperties::COLOR_NTP_SECTION_LINK },
|
| - { "ntp_section_link_underline",
|
| - ThemeProperties::COLOR_NTP_SECTION_LINK_UNDERLINE },
|
| { "button_background", ThemeProperties::COLOR_BUTTON_BACKGROUND },
|
| };
|
| const size_t kColorTableLength = arraysize(kColorTable);
|
| @@ -980,28 +975,12 @@ void BrowserThemePack::ReadColorsFromJSON(
|
|
|
| void BrowserThemePack::GenerateMissingColors(
|
| std::map<int, SkColor>* colors) {
|
| - // Generate link colors, if missing. (See GetColor()).
|
| if (!colors->count(ThemeProperties::COLOR_NTP_HEADER) &&
|
| colors->count(ThemeProperties::COLOR_NTP_SECTION)) {
|
| (*colors)[ThemeProperties::COLOR_NTP_HEADER] =
|
| (*colors)[ThemeProperties::COLOR_NTP_SECTION];
|
| }
|
|
|
| - if (!colors->count(ThemeProperties::COLOR_NTP_SECTION_LINK_UNDERLINE) &&
|
| - colors->count(ThemeProperties::COLOR_NTP_SECTION_LINK)) {
|
| - SkColor color_section_link =
|
| - (*colors)[ThemeProperties::COLOR_NTP_SECTION_LINK];
|
| - (*colors)[ThemeProperties::COLOR_NTP_SECTION_LINK_UNDERLINE] =
|
| - SkColorSetA(color_section_link, SkColorGetA(color_section_link) / 3);
|
| - }
|
| -
|
| - if (!colors->count(ThemeProperties::COLOR_NTP_LINK_UNDERLINE) &&
|
| - colors->count(ThemeProperties::COLOR_NTP_LINK)) {
|
| - SkColor color_link = (*colors)[ThemeProperties::COLOR_NTP_LINK];
|
| - (*colors)[ThemeProperties::COLOR_NTP_LINK_UNDERLINE] =
|
| - SkColorSetA(color_link, SkColorGetA(color_link) / 3);
|
| - }
|
| -
|
| // Generate frame colors, if missing. (See GenerateFrameColors()).
|
| SkColor frame;
|
| std::map<int, SkColor>::const_iterator it =
|
|
|