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

Unified Diff: chrome/browser/extensions/apps_promo.cc

Issue 10578017: Test GURL::spec() usage changes with DEPS rolled to the new version. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 8 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698