Merge 32413 - Tweaks and fixes for NTP extension promo....

chrome/browser/dom_ui/dom_ui_theme_source.cc

Index: chrome/browser/dom_ui/dom_ui_theme_source.cc
===================================================================
--- chrome/browser/dom_ui/dom_ui_theme_source.cc	(revision 32511)
+++ chrome/browser/dom_ui/dom_ui_theme_source.cc	(working copy)
@@ -184,13 +184,22 @@
   subst2.push_back(SkColorToRGBAString(color_link_underline));  // $$6
   subst2.push_back(SkColorToRGBAString(color_section_link_underline));  // $$7
 
-  if (profile->GetPrefs()->GetInteger(prefs::kNTPPromoRemaining) > 0) {
+#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 {
+    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(