| Index: chrome/browser/extensions/apps_promo.cc
|
| diff --git a/chrome/browser/extensions/apps_promo.cc b/chrome/browser/extensions/apps_promo.cc
|
| index 0b5ce5689d6e7330b2e715fd8e2bedeb1263f557..53f7238b744c4d6ca14a48a43a0c1296a6b0c327 100644
|
| --- a/chrome/browser/extensions/apps_promo.cc
|
| +++ b/chrome/browser/extensions/apps_promo.cc
|
| @@ -172,11 +172,14 @@ AppsPromo::PromoData AppsPromo::GetPromo() {
|
| // static
|
| void AppsPromo::SetPromo(const AppsPromo::PromoData& data) {
|
| PrefService* local_state = g_browser_process->local_state();
|
| + std::string empty;
|
| local_state->SetString(prefs::kNtpWebStorePromoId, data.id);
|
| local_state->SetString(prefs::kNtpWebStorePromoButton, data.button);
|
| local_state->SetString(prefs::kNtpWebStorePromoHeader, data.header);
|
| - local_state->SetString(prefs::kNtpWebStorePromoLink, data.link.spec());
|
| - local_state->SetString(prefs::kNtpWebStorePromoLogo, data.logo.spec());
|
| + local_state->SetString(prefs::kNtpWebStorePromoLink,
|
| + data.link.is_valid() ? data.link.spec() : empty);
|
| + local_state->SetString(prefs::kNtpWebStorePromoLogo,
|
| + data.logo.is_valid() ? data.logo.spec() : empty);
|
| local_state->SetString(prefs::kNtpWebStorePromoExpire, data.expire);
|
| local_state->SetInteger(prefs::kNtpWebStorePromoUserGroup, data.user_group);
|
| }
|
| @@ -188,9 +191,10 @@ GURL AppsPromo::GetSourcePromoLogoURL() {
|
|
|
| // static
|
| void AppsPromo::SetSourcePromoLogoURL(const GURL& logo_source) {
|
| - PrefService* local_state = g_browser_process->local_state();
|
| + PrefService* local_state = g_browser_process->local_state();\
|
| + std::string empty;
|
| local_state->SetString(prefs::kNtpWebStorePromoLogoSource,
|
| - logo_source.spec());
|
| + logo_source.is_valid() ? logo_source.spec() : empty);
|
| }
|
|
|
| AppsPromo::AppsPromo(PrefService* prefs)
|
|
|