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

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 199 matching lines @@
   virtual void RegisterMessages();
 
   // Zero promotional message counter.
   void HandleClosePromotionalMessage(const Value* content);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PromotionalMessageHandler);
 };
 
 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);
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // RecentlyClosedTabsHandler
 
 class RecentlyClosedTabsHandler : public DOMMessageHandler,
                                   public TabRestoreService::Observer {
  public:
   RecentlyClosedTabsHandler() : tab_restore_service_(NULL) {}
@@ skipping 321 matching lines @@
   force_extension_shelf_visible_ = true;
   focus_location_bar_by_default_ = true;
   should_hide_url_ = true;
   overridden_title_ = WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_TITLE));
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // 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);
 
   InitializeCSSCaches();
   if (GetProfile()->IsOffTheRecord()) {
     incognito_ = true;
 
     IncognitoTabHTMLSource* html_source = new IncognitoTabHTMLSource(
         GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar));
     ChromeThread::PostTask(
@@ skipping 346 matching lines @@
   else
     localized_strings.SetString(L"syncispresent", "false");
 
   if (!profile->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
     localized_strings.SetString(L"showsetashomepage", "true");
 
   SetFontAndTextDirection(&localized_strings);
 
   // 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;
   }
 
   // Control fade and resize animations.
   std::wstring anim =
       Animation::ShouldRenderRichAnimation() ? L"true" : L"false";
   localized_strings.SetString(L"anim", anim);
 
   // Pass the shown_sections pref early so that we can prevent flicker.
   const int shown_sections = profile->GetPrefs()->GetInteger(
@@ skipping 30 matching lines @@
     full_html_.append(json_html);
     size_t after_offset = pos + template_data_placeholder.size();
     full_html_.append(new_tab_html.data() + after_offset,
                       new_tab_html.size() - after_offset);
   } else {
     NOTREACHED();
     full_html_.assign(new_tab_html.data(), new_tab_html.size());
   }
   jstemplate_builder::AppendI18nTemplateProcessHtml(&full_html_);
 }