| Index: chrome/browser/web_resource/promo_resource_service.cc
|
| ===================================================================
|
| --- chrome/browser/web_resource/promo_resource_service.cc (revision 94426)
|
| +++ chrome/browser/web_resource/promo_resource_service.cc (working copy)
|
| @@ -268,8 +268,10 @@
|
| promo_end_string.length() > 0) {
|
| base::Time start_time;
|
| base::Time end_time;
|
| - if (base::Time::FromString(promo_start_string.c_str(), &start_time) &&
|
| - base::Time::FromString(promo_end_string.c_str(), &end_time)) {
|
| + if (base::Time::FromString(
|
| + ASCIIToWide(promo_start_string).c_str(), &start_time) &&
|
| + base::Time::FromString(
|
| + 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) ?
|
| @@ -428,8 +430,10 @@
|
| logo_end_string.length() > 0) {
|
| base::Time start_time;
|
| base::Time end_time;
|
| - if (base::Time::FromString(logo_start_string.c_str(), &start_time) &&
|
| - base::Time::FromString(logo_end_string.c_str(), &end_time)) {
|
| + if (base::Time::FromString(
|
| + ASCIIToWide(logo_start_string).c_str(), &start_time) &&
|
| + base::Time::FromString(
|
| + ASCIIToWide(logo_end_string).c_str(), &end_time)) {
|
| logo_start = start_time.ToDoubleT();
|
| logo_end = end_time.ToDoubleT();
|
| }
|
|
|