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

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

Issue 6893031: Revert r83048 "Removed wchar_t from Time::FromString." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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 | « base/time_unittest.cc ('k') | chrome/common/metrics_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_resource/promo_resource_service.cc
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc
index e3f43e9a07d3c97aeafbcd40047d7038bab8eb55..d9f526fca59504b358f88ab9c16e8ef3cfd863ea 100644
--- a/chrome/browser/web_resource/promo_resource_service.cc
+++ b/chrome/browser/web_resource/promo_resource_service.cc
@@ -252,9 +252,9 @@ void PromoResourceService::UnpackPromoSignal(
base::Time start_time;
base::Time end_time;
if (base::Time::FromString(
- promo_start_string.c_str(), &start_time) &&
+ ASCIIToWide(promo_start_string).c_str(), &start_time) &&
base::Time::FromString(
- promo_end_string.c_str(), &end_time)) {
+ ASCIIToWide(promo_end_string).c_str(), &end_time)) {
// Add group time slice, adjusted from hours to seconds.
promo_start = start_time.ToDoubleT() +
(prefs_->FindPreference(prefs::kNTPPromoGroup) ?
@@ -389,9 +389,9 @@ void PromoResourceService::UnpackLogoSignal(
base::Time start_time;
base::Time end_time;
if (base::Time::FromString(
- logo_start_string.c_str(), &start_time) &&
+ ASCIIToWide(logo_start_string).c_str(), &start_time) &&
base::Time::FromString(
- logo_end_string.c_str(), &end_time)) {
+ ASCIIToWide(logo_end_string).c_str(), &end_time)) {
logo_start = start_time.ToDoubleT();
logo_end = end_time.ToDoubleT();
}
« no previous file with comments | « base/time_unittest.cc ('k') | chrome/common/metrics_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698