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

Unified Diff: chrome/browser/resources/local_ntp/local_ntp.js

Issue 1007323008: [New Tab Page] Change color format used by NTP_DESIGN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/resources/local_ntp/local_ntp_design.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/local_ntp/local_ntp.js
diff --git a/chrome/browser/resources/local_ntp/local_ntp.js b/chrome/browser/resources/local_ntp/local_ntp.js
index c398058c8c86362916764db8f44926f3168c43aa..023255e4d833be382d50a579bdb2ea10b21cfef5 100644
--- a/chrome/browser/resources/local_ntp/local_ntp.js
+++ b/chrome/browser/resources/local_ntp/local_ntp.js
@@ -340,15 +340,15 @@ function renderTheme() {
var isThemeDark = getIsThemeDark(info);
ntpContents.classList.toggle(CLASSES.DARK, isThemeDark);
if (!info) {
- titleColor = NTP_DESIGN.titleColor;
+ titleColor = convertToRRGGBBAAColor(NTP_DESIGN.titleColor);
return;
}
if (!info.usingDefaultTheme && info.textColorRgba) {
titleColor = convertToRRGGBBAAColor(info.textColorRgba);
} else {
- titleColor = isThemeDark ?
- NTP_DESIGN.titleColorAgainstDark : NTP_DESIGN.titleColor;
+ titleColor = convertToRRGGBBAAColor(isThemeDark ?
+ NTP_DESIGN.titleColorAgainstDark : NTP_DESIGN.titleColor);
}
var background = [convertToRGBAColor(info.backgroundColorRgba),
@@ -646,11 +646,12 @@ function getMostVisitedTitleIframeUrl(rid, position) {
function getMostVisitedThumbnailIframeUrl(rid, position) {
var url = 'chrome-search://most-visited/' +
encodeURIComponent(MOST_VISITED_THUMBNAIL_IFRAME);
+ var colorString = convertToRRGGBBAAColor(NTP_DESIGN.thumbnailTextColor);
var params = [
'rid=' + encodeURIComponent(rid),
'f=' + encodeURIComponent(NTP_DESIGN.fontFamily),
'fs=' + encodeURIComponent(NTP_DESIGN.fontSize),
- 'c=' + encodeURIComponent(NTP_DESIGN.thumbnailTextColor),
+ 'c=' + encodeURIComponent(colorString),
'pos=' + encodeURIComponent(position)];
if (NTP_DESIGN.thumbnailFallback)
params.push('etfb=1');
« no previous file with comments | « no previous file | chrome/browser/resources/local_ntp/local_ntp_design.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698