summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 21:17:43 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 21:17:43 +0000
commitc8559b7daaa7d9877fca1cf355baf62eb4c54668 (patch)
treec8551012cfbc0800aad09af6ed7cb08b67311935 /chrome/browser/dom_ui
parentceae8579ac4d3329eec766525f976f6383678c76 (diff)
downloadchromium_src-c8559b7daaa7d9877fca1cf355baf62eb4c54668.zip
chromium_src-c8559b7daaa7d9877fca1cf355baf62eb4c54668.tar.gz
chromium_src-c8559b7daaa7d9877fca1cf355baf62eb4c54668.tar.bz2
- Fix bug where white logo wasn't showing
- Add attribution support back to the NTP BUG=20019 TEST=Install a theme with a white logo and attribution, and verify that both display correctly. Review URL: http://codereview.chromium.org/173372 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/dom_ui_theme_source.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc
index b7f5aab..59f3485 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc
@@ -148,6 +148,9 @@ void DOMUIThemeSource::SendNewTabCSS(int request_id) {
subst2.push_back(SkColorToRGBAString(color_section_border)); // $$2
subst2.push_back(SkColorToRGBAString(color_section_text)); // $$3
subst2.push_back(SkColorToRGBAString(color_section_link)); // $$4
+ subst2.push_back(
+ UTF8ToUTF16(tp->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ?
+ "block" : "none")); // $$5
// Get our template.
static const StringPiece new_tab_theme_css(