Allow max_group = 0 to pass all groups.

chrome/browser/web_resource/notification_promo.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/notification_promo.h"
 
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 126 matching lines @@
 
   // Grouping.
   DictionaryValue* grouping;
   if (promo->GetDictionary("grouping", &grouping)) {
     grouping->GetInteger("buckets", &num_groups_);
     grouping->GetInteger("segment", &initial_segment_);
     grouping->GetInteger("increment", &increment_);
     grouping->GetInteger("increment_frequency", &time_slice_);
     grouping->GetInteger("increment_max", &max_group_);
 
-    DVLOG(1) << "num_groups_=" << num_groups_;
-    DVLOG(1) << "initial_segment_ = " << initial_segment_;
-    DVLOG(1) << "increment_ = " << increment_;
-    DVLOG(1) << "time_slice_ = " << time_slice_;
-    DVLOG(1) << "max_group_ = " << max_group_;
+    DVLOG(1) << "num_groups_ = " << num_groups_
+             << ", initial_segment_ = " << initial_segment_
+             << ", increment_ = " << increment_
+             << ", time_slice_ = " << time_slice_
+             << ", max_group_ = " << max_group_;
   }
 
   // Payload.
   DictionaryValue* payload;
   if (promo->GetDictionary("payload", &payload)) {
     payload->GetBoolean("gplus_required", &gplus_required_);
 
     DVLOG(1) << "gplus_required_ = " << gplus_required_;
   }
 
@@ skipping 114 matching lines @@
   group_ = prefs_->GetInteger(prefs::kNtpPromoGroup);
   views_ = prefs_->GetInteger(prefs::kNtpPromoViews);
   closed_ = prefs_->GetBoolean(prefs::kNtpPromoClosed);
 
   gplus_required_ = prefs_->GetBoolean(prefs::kNtpPromoGplusRequired);
 }
 
 bool NotificationPromo::CanShow() const {
   return !closed_ &&
       !promo_text_.empty() &&
-      group_ < max_group_ &&
+      !ExceedsMaxGroup() &&
       !ExceedsMaxViews() &&
       base::Time::FromDoubleT(StartTimeForGroup()) < base::Time::Now() &&
       base::Time::FromDoubleT(EndTime()) > base::Time::Now() &&
       IsGPlusRequired();
 }
 
 void NotificationPromo::HandleClosed() {
   content::RecordAction(UserMetricsAction("NTPPromoClosed"));
   prefs_->SetBoolean(prefs::kNtpPromoClosed, true);
 }
 
 bool NotificationPromo::HandleViewed() {
   content::RecordAction(UserMetricsAction("NTPPromoShown"));
   if (prefs_->HasPrefPath(prefs::kNtpPromoViewsMax))
     max_views_ = prefs_->GetInteger(prefs::kNtpPromoViewsMax);
 
   if (prefs_->HasPrefPath(prefs::kNtpPromoViews))
     views_ = prefs_->GetInteger(prefs::kNtpPromoViews);
 
   prefs_->SetInteger(prefs::kNtpPromoViews, ++views_);
   return ExceedsMaxViews();
 }
 
+bool NotificationPromo::ExceedsMaxGroup() const {
+  return (max_group_ == 0) ? false : group_ >= max_group_;
+}
+
 bool NotificationPromo::ExceedsMaxViews() const {
   return (max_views_ == 0) ? false : views_ >= max_views_;
 }
 
 bool NotificationPromo::IsGPlusRequired() const {
   return !gplus_required_ || prefs_->GetBoolean(prefs::kIsGooglePlusUser);
 }
 
 // static
 GURL NotificationPromo::PromoServerURL() {
@@ skipping 13 matching lines @@
   if (group_ < initial_segment_)
     return start_;
   return start_ +
       std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
       * time_slice_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }