diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 00:02:00 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 00:02:00 +0000 |
| commit | 7d8dc6258b7c9dd771eaf509f5403b602a838388 (patch) | |
| tree | dbfabd99f897af4e90a83516b04f7eb2d0151b3d /chrome/browser/dom_ui/dom_ui_theme_source.cc | |
| parent | 753008ab2457c5fc815933ca9eb04bd9fd2582da (diff) | |
| download | chromium_src-7d8dc6258b7c9dd771eaf509f5403b602a838388.zip chromium_src-7d8dc6258b7c9dd771eaf509f5403b602a838388.tar.gz chromium_src-7d8dc6258b7c9dd771eaf509f5403b602a838388.tar.bz2 | |
Revert 32176 - Tweaks and fixes for NTP extension promo.
Don't show promo for extensions on Mac, as they're not available yet. Decrement promo counter even when NTP is not home page, and do not remove puzzle piece when promo line is closed. When message bar is closed, make it zip off bottom of screen instead of just disappearing.
BUG= 27814, 25258, 27815
TEST= see various bugs.
Review URL: http://codereview.chromium.org/385135
TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/399051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/dom_ui_theme_source.cc')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_theme_source.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc index 759033b..e5e473f 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc @@ -184,22 +184,13 @@ void DOMUIThemeSource::InitNewTabCSS(Profile* profile) { 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) { + if (profile->GetPrefs()->GetInteger(prefs::kNTPPromoRemaining) > 0) { subst2.push_back("block"); // $$8 - } else { - subst2.push_back("none"); // $$8 - } - if (profile->GetPrefs()->GetInteger(prefs::kNTPPromoLineRemaining) > 0) { subst2.push_back("inline-block"); // $$9 } else { + subst2.push_back("none"); // $$8 subst2.push_back("none"); // $$9 } -#endif // Get our template. static const base::StringPiece new_tab_theme_css( |