diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:25:34 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:25:34 +0000 |
| commit | 76aa2f684a2cdbd8b476001230d4f1e244196a69 (patch) | |
| tree | 1cf3b904d5cb4f7e3ecff3ca1ae0580746c35f4a /chrome/browser/dom_ui/ntp_resource_cache.cc | |
| parent | 2a0fef6f8968901f60e6870731da2e3adf31aabd (diff) | |
| download | chromium_src-76aa2f684a2cdbd8b476001230d4f1e244196a69.zip chromium_src-76aa2f684a2cdbd8b476001230d4f1e244196a69.tar.gz chromium_src-76aa2f684a2cdbd8b476001230d4f1e244196a69.tar.bz2 | |
Bring back attribution. If there is no custom attribution, fall back to the product logo.
BUG=53970
TEST=
Review URL: http://codereview.chromium.org/3336004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/ntp_resource_cache.cc')
| -rw-r--r-- | chrome/browser/dom_ui/ntp_resource_cache.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 56b1290..c2209bd 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -451,19 +451,17 @@ void NTPResourceCache::CreateNewTabCSS() { 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( - tp->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ? "block" : "none"); // $$5 - subst2.push_back(SkColorToRGBAString(color_link_underline)); // $$6 - subst2.push_back(SkColorToRGBAString(color_section_link_underline)); // $$7 - subst2.push_back(SkColorToRGBAString(color_section_header_text)); // $$8 + subst2.push_back(SkColorToRGBAString(color_link_underline)); // $$5 + subst2.push_back(SkColorToRGBAString(color_section_link_underline)); // $$6 + subst2.push_back(SkColorToRGBAString(color_section_header_text)); // $$7 subst2.push_back(SkColorToRGBAString( - color_section_header_text_hover)); // $$9 + color_section_header_text_hover)); // $$8 + subst2.push_back(SkColorToRGBAString(color_section_header_rule)); // $$9 - subst3.push_back(SkColorToRGBAString(color_section_header_rule)); // $$$1 subst3.push_back(SkColorToRGBAString( - color_section_header_rule_light)); // $$$2 + color_section_header_rule_light)); // $$$1 subst3.push_back(SkColorToRGBAString( - SkColorSetA(color_section_header_rule, 0))); // $$$3 + SkColorSetA(color_section_header_rule, 0))); // $$$2 // Get our template. |