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.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=32176
Review URL: http://codereview.chromium.org/385135

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32413 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 15 deletions

diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc
index e5e473f..759033b 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc
@@ -184,13 +184,22 @@ void DOMUIThemeSource::InitNewTabCSS(Profile* profile) {
   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
-    subst2.push_back("inline-block");  // $$9
   } else {
     subst2.push_back("none");  // $$8
+  }
+  if (profile->GetPrefs()->GetInteger(prefs::kNTPPromoLineRemaining) > 0) {
+    subst2.push_back("inline-block");  // $$9
+  } else {
     subst2.push_back("none");  // $$9
   }
+#endif
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 02dc255a..7c8c507 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -219,14 +219,15 @@ class PromotionalMessageHandler : public DOMMessageHandler {
 };
 
 void PromotionalMessageHandler::RegisterMessages() {
-  dom_ui_->RegisterMessageCallback("stopPromoMessages",
+  dom_ui_->RegisterMessageCallback("stopPromoLineMessage",
       NewCallback(this,
                   &PromotionalMessageHandler::HandleClosePromotionalMessage));
 }
 
 void PromotionalMessageHandler::HandleClosePromotionalMessage(
     const Value* content) {
-  dom_ui_->GetProfile()->GetPrefs()->SetInteger(prefs::kNTPPromoRemaining, 0);
+  dom_ui_->GetProfile()->GetPrefs()->SetInteger(
+      prefs::kNTPPromoLineRemaining, 0);
 }
 
 
@@ -569,12 +570,6 @@ NewTabUI::NewTabUI(TabContents* contents)
   // thumbnails, but also clicks on recently bookmarked.
   link_transition_type_ = PageTransition::AUTO_BOOKMARK;
 
-  if (NewTabHTMLSource::first_view() &&
-      (GetProfile()->GetPrefs()->GetInteger(prefs::kRestoreOnStartup) != 0 ||
-       !GetProfile()->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))) {
-    NewTabHTMLSource::set_first_view(false);
-  }
-
   if (NewTabUI::FirstRunDisabled())
     NewTabHTMLSource::set_first_run(false);
 
@@ -941,12 +936,12 @@ void NewTabUI::NewTabHTMLSource::InitFullHTML(Profile* profile) {
 
   // Let the tab know whether it's the first tab being viewed.
   if (first_view_) {
-    localized_strings.SetString(L"firstview", L"true");
-
-    // Decrement ntp promo counter; the default value is specified in
+    // Decrement ntp promo counters; the default values are specified in
     // Browser::RegisterUserPrefs.
-    profile->GetPrefs()->SetInteger(prefs::kNTPPromoRemaining,
-        profile->GetPrefs()->GetInteger(prefs::kNTPPromoRemaining) - 1);
+    profile->GetPrefs()->SetInteger(prefs::kNTPPromoLineRemaining,
+        profile->GetPrefs()->GetInteger(prefs::kNTPPromoLineRemaining) - 1);
+    profile->GetPrefs()->SetInteger(prefs::kNTPPromoImageRemaining,
+        profile->GetPrefs()->GetInteger(prefs::kNTPPromoImageRemaining) - 1);
     first_view_ = false;
   }