diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 22:40:23 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 22:40:23 +0000 |
| commit | 2de9333c9d608fcdfd0694d95652576718d4a4d0 (patch) | |
| tree | 34fda82a0a2e6b62c4838b4ec0ac23891ec153f6 /chrome | |
| parent | 97b6011428a296880615974eb66b8cb709f80e03 (diff) | |
| download | chromium_src-2de9333c9d608fcdfd0694d95652576718d4a4d0.zip chromium_src-2de9333c9d608fcdfd0694d95652576718d4a4d0.tar.gz chromium_src-2de9333c9d608fcdfd0694d95652576718d4a4d0.tar.bz2 | |
Add promo for extensions and bookmark sync back into the Mac NTP. Also, fix font size bug
that snuck in with a recent webkit roll.
BUG= 33291
TEST= run a Mac build with a new profile. See the extension / sync promo line and the puzzle piece on the NTP.
Review URL: http://codereview.chromium.org/552193
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/dom_ui/ntp_resource_cache.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/new_new_tab.css | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index ac935aa..dde351b 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -518,11 +518,6 @@ void NTPResourceCache::CreateNewTabCSS() { subst2.push_back(SkColorToRGBAString(color_link_underline)); // $$6 subst2.push_back(SkColorToRGBAString(color_section_link_underline)); // $$7 -#if defined(OS_MACOSX) - // No extensions available on Mac yet. - subst2.push_back("none"); // $$8: display of lower right promo image - subst2.push_back("none"); // $$9: display of butterbar footer promo line -#else if (profile_->GetPrefs()->GetInteger(prefs::kNTPPromoImageRemaining) > 0) { subst2.push_back("block"); // $$8 } else { @@ -533,7 +528,6 @@ void NTPResourceCache::CreateNewTabCSS() { } else { subst2.push_back("none"); // $$9 } -#endif // Get our template. static const base::StringPiece new_tab_theme_css( diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_new_tab.css index 443103a..39cba91 100644 --- a/chrome/browser/resources/new_new_tab.css +++ b/chrome/browser/resources/new_new_tab.css @@ -721,6 +721,7 @@ html[dir='rtl'] #option-menu > [command='hide']:before { } .sync-button { + font-size: inherit; padding: 0; margin: 0; -webkit-appearance: none; |