Add new promotional line for NTP....

chrome/browser/dom_ui/ntp_resource_cache.cc

 // Copyright (c) 2010 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/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/ref_counted_memory.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/color_utils.h"
 #include "grit/browser_resources.h"
@@ skipping 89 matching lines @@
 
 // How the background image on the new tab page should be tiled (see tiling
 // masks in browser_theme_provider.h).
 std::string GetNewTabBackgroundTilingCSS(const ThemeProvider* theme_provider) {
   int repeat_mode;
   theme_provider->GetDisplayProperty(
       BrowserThemeProvider::NTP_BACKGROUND_TILING, &repeat_mode);
   return BrowserThemeProvider::TilingToString(repeat_mode);
 }
 
+// Is the current time within a given date range?
+bool InDateRange(double begin, double end) {
+  Time start_time = Time::FromDoubleT(begin);
+  Time end_time = Time::FromDoubleT(end);
+  return start_time < Time::Now() && end_time > Time::Now();
+}
+
 }  // namespace
 
 NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::WEB_RESOURCE_AVAILABLE,
+  registrar_.Add(this, NotificationType::WEB_RESOURCE_STATE_CHANGED,
                  NotificationService::AllSources());
 
   // Watch for pref changes that cause us to need to invalidate the HTML cache.
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   pref_change_registrar_.Add(prefs::kNTPShownSections, this);
 }
 
 NTPResourceCache::~NTPResourceCache() {}
 
@@ skipping 20 matching lines @@
       CreateNewTabCSS();
   }
   return is_off_the_record ? new_tab_incognito_css_.get()
                            : new_tab_css_.get();
 }
 
 void NTPResourceCache::Observe(NotificationType type,
     const NotificationSource& source, const NotificationDetails& details) {
   // Invalidate the cache.
   if (NotificationType::BROWSER_THEME_CHANGED == type ||
-      NotificationType::WEB_RESOURCE_AVAILABLE == type) {
+      NotificationType::WEB_RESOURCE_STATE_CHANGED == type) {
     new_tab_incognito_html_ = NULL;
     new_tab_html_ = NULL;
     new_tab_incognito_css_ = NULL;
     new_tab_css_ = NULL;
   } else if (NotificationType::PREF_CHANGED == type) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kShowBookmarkBar ||
         *pref_name == prefs::kHomePageIsNewTabPage ||
         *pref_name == prefs::kNTPShownSections) {
       new_tab_incognito_html_ = NULL;
@@ skipping 148 matching lines @@
 
   // Pass the shown_sections pref early so that we can prevent flicker.
   const int shown_sections = ShownSectionsHandler::GetShownSections(
       profile_->GetPrefs());
   localized_strings.SetInteger("shown_sections", shown_sections);
 
   // If the user has preferences for a start and end time for a custom logo,
   // and the time now is between these two times, show the custom logo.
   if (profile_->GetPrefs()->FindPreference(prefs::kNTPCustomLogoStart) &&
       profile_->GetPrefs()->FindPreference(prefs::kNTPCustomLogoEnd)) {
-    Time start_time = Time::FromDoubleT(
-        profile_->GetPrefs()->GetReal(prefs::kNTPCustomLogoStart));
-    Time end_time = Time::FromDoubleT(
-        profile_->GetPrefs()->GetReal(prefs::kNTPCustomLogoEnd));
     localized_strings.SetString("customlogo",
-        (start_time < Time::Now() && end_time > Time::Now()) ?
+        InDateRange(profile_->GetPrefs()->GetReal(prefs::kNTPCustomLogoStart),
+                    profile_->GetPrefs()->GetReal(prefs::kNTPCustomLogoEnd)) ?
         "true" : "false");
   } else {
     localized_strings.SetString("customlogo", "false");
   }
 
+  // If the user has preferences for a start and end time for a promo from
+  // the server, and this promo string exists, set the localized string.
+  if (profile_->GetPrefs()->FindPreference(prefs::kNTPPromoStart) &&
+      profile_->GetPrefs()->FindPreference(prefs::kNTPPromoEnd) &&
+      profile_->GetPrefs()->FindPreference(prefs::kNTPPromoLine) &&
+      WebResourceServiceUtil::CanShowPromo(profile_)) {
+    localized_strings.SetString("serverpromo",
+        InDateRange(profile_->GetPrefs()->GetReal(prefs::kNTPPromoStart),
+                    profile_->GetPrefs()->GetReal(prefs::kNTPPromoEnd)) ?
+                    profile_->GetPrefs()->GetString(prefs::kNTPPromoLine) :
+                                                    std::string());
+  }
+
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_NEW_NEW_TAB_HTML));
 
   // Inject the template data into the HTML so that it is available before any
   // layout is needed.
   std::string json_html;
   jstemplate_builder::AppendJsonHtml(&localized_strings, &json_html);
 
   static const base::StringPiece template_data_placeholder(
       "<!-- template data placeholder -->");
@@ skipping 149 matching lines @@
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
 
   new_tab_css_ = new RefCountedBytes;
   new_tab_css_->data.resize(css_string.size());
   std::copy(css_string.begin(), css_string.end(),
             new_tab_css_->data.begin());
 }