Immediate notification if active promotion arrives

chrome/browser/web_resource/promo_resource_service.cc

 // Copyright (c) 2012 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/web_resource/promo_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 132 matching lines @@
 
 void PromoResourceService::ScheduleNotification(double promo_start,
                                                 double promo_end) {
   if (promo_start > 0 && promo_end > 0) {
     int64 ms_until_start =
         static_cast<int64>((base::Time::FromDoubleT(
             promo_start) - base::Time::Now()).InMilliseconds());
     int64 ms_until_end =
         static_cast<int64>((base::Time::FromDoubleT(
             promo_end) - base::Time::Now()).InMilliseconds());
-    if (ms_until_start > 0)
+    if (ms_until_start > 0) {
+      // Schedule the next notification to happen at the start of promotion.
       PostNotification(ms_until_start);
-    if (ms_until_end > 0) {
-      PostNotification(ms_until_end);
+    } else if (ms_until_end > 0) {
       if (ms_until_start <= 0) {
         // Notify immediately if time is between start and end.
         PostNotification(0);
       }
+      // Schedule the next notification to happen at the end of promotion.
+      PostNotification(ms_until_end);
     }
   }
 }
 
 void PromoResourceService::ScheduleNotificationOnInit() {
   std::string locale = g_browser_process->GetApplicationLocale();
   if (GetPromoServiceVersion() != kPromoServiceVersion ||
       GetPromoLocale() != locale) {
     // If the promo service has been upgraded or Chrome switched locales,
     // refresh the promos.
@@ skipping 211 matching lines @@
       !(old_logo_end == logo_end)) {
     prefs_->SetDouble(prefs::kNtpCustomLogoStart, logo_start);
     prefs_->SetDouble(prefs::kNtpCustomLogoEnd, logo_end);
     content::NotificationService* service =
         content::NotificationService::current();
     service->Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                     content::Source<WebResourceService>(this),
                     content::NotificationService::NoDetails());
   }
 }