Tweaks for promo messages on NTP

chrome/browser/dom_ui/dom_ui_theme_source.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/message_loop.h"
@@ skipping 166 matching lines @@
 
   subst2.push_back(SkColorToRGBAString(color_section));  // $$1
   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
 
-  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(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_NEW_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   const std::string css_string = ReplaceStringPlaceholders(
       new_tab_theme_css, subst, NULL);
   new_tab_css_ = ReplaceStringPlaceholders(
@@ skipping 88 matching lines @@
   return BrowserThemeProvider::AlignmentToString(alignment);
 }
 
 std::string DOMUIThemeSource::GetNewTabBackgroundTilingCSS() {
   int repeat_mode;
   profile_->GetThemeProvider()->GetDisplayProperty(
       BrowserThemeProvider::NTP_BACKGROUND_TILING, &repeat_mode);
   return BrowserThemeProvider::TilingToString(repeat_mode);
 }