Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: chrome/browser/themes/browser_theme_pack.cc

Issue 2159833002: Revert of Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/themes/browser_theme_pack_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 33dd98a8cd2d6b37fdc5e6f4e217dd410b6d9f1b..59a1b7fd2e6e66e0ce75ee3e0aac04362f677613 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -49,7 +49,7 @@
// theme packs that aren't int-equal to this. Increment this number if you
// change default theme assets or if you need themes to recreate their generated
// images (which are cached).
-const int kThemePackVersion = 43;
+const int kThemePackVersion = 42;
// IDs that are in the DataPack won't clash with the positive integer
// uint16_t. kHeaderID should always have the maximum value because we want the
@@ -791,12 +791,9 @@
if (colors_[i].id == id) {
*color = colors_[i].color;
// The theme provider is intentionally made to ignore alpha for toolbar
- // color, as we don't want to allow transparent toolbars. Same for the
- // ntp background color.
- if (id == ThemeProperties::COLOR_TOOLBAR ||
- id == ThemeProperties::COLOR_NTP_BACKGROUND) {
+ // color, as we don't want to allow transparent toolbars.
+ if (id == ThemeProperties::COLOR_TOOLBAR)
*color = SkColorSetA(*color, SK_AlphaOPAQUE);
- }
return true;
}
}
« no previous file with comments | « no previous file | chrome/browser/themes/browser_theme_pack_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698