Support for ntp promo bubble.

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 90 matching lines @@
 }
 
 struct PromoMapEntry {
   NotificationPromo::PromoType promo_type;
   const char* promo_type_str;
 };
 
 const PromoMapEntry kPromoMap[] = {
     { NotificationPromo::NO_PROMO, "" },
     { NotificationPromo::NTP_NOTIFICATION_PROMO, "ntp_notification_promo" },
-    { NotificationPromo::BUBBLE_PROMO, "bubble_promo" },
+    { NotificationPromo::NTP_BUBBLE_PROMO, "ntp_bubble_promo" },
     { NotificationPromo::MOBILE_NTP_SYNC_PROMO, "mobile_ntp_sync_promo" },
 };
 
 // Convert PromoType to appropriate string.
 const char* PromoTypeToString(NotificationPromo::PromoType promo_type) {
   for (size_t i = 0; i < arraysize(kPromoMap); ++i) {
     if (kPromoMap[i].promo_type == promo_type)
       return kPromoMap[i].promo_type_str;
   }
   NOTREACHED();
@@ skipping 170 matching lines @@
   DCHECK(profile);
   DCHECK(prefs_);
 }
 
 NotificationPromo::~NotificationPromo() {}
 
 void NotificationPromo::InitFromJson(const DictionaryValue& json,
                                      PromoType promo_type) {
   promo_type_ = promo_type;
   const ListValue* promo_list = NULL;
-  if (!json.GetList(PromoTypeToString(promo_type_), &promo_list)) {
-    LOG(ERROR) << "Malformed JSON: not " << PromoTypeToString(promo_type_);
+  DVLOG(1) << "InitFromJson " << PromoTypeToString(promo_type_);
+  if (!json.GetList(PromoTypeToString(promo_type_), &promo_list))
     return;
-  }
 
   // No support for multiple promos yet. Only consider the first one.
   const DictionaryValue* promo = NULL;
   if (!promo_list->GetDictionary(0, &promo))
     return;
 
   // Date.
   const ListValue* date_list = NULL;
   if (promo->GetList("date", &date_list)) {
     const DictionaryValue* date;
@@ skipping 221 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_;
 }