Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1566)

Unified Diff: chrome/browser/web_resource/notification_promo.cc

Issue 10911196: Support for ntp promo bubble. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: allow BR in parseHtmlSubset Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/web_resource/notification_promo.cc
===================================================================
--- chrome/browser/web_resource/notification_promo.cc (revision 155564)
+++ chrome/browser/web_resource/notification_promo.cc (working copy)
@@ -108,7 +108,7 @@
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" },
};
@@ -299,10 +299,9 @@
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;
« no previous file with comments | « chrome/browser/web_resource/notification_promo.h ('k') | chrome/browser/web_resource/promo_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698