diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 18:16:21 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 18:16:21 +0000 |
| commit | 13b5f4ab4185b9ad372556f6f49ac43ed3e6c9fb (patch) | |
| tree | 32439c0ed997eba3a45813d58f44bcf1ac554e32 /chrome/browser/web_resource | |
| parent | a032ea356ab1e79d1041a976de1fd1ab5b3e47bb (diff) | |
| download | chromium_src-13b5f4ab4185b9ad372556f6f49ac43ed3e6c9fb.zip chromium_src-13b5f4ab4185b9ad372556f6f49ac43ed3e6c9fb.tar.gz chromium_src-13b5f4ab4185b9ad372556f6f49ac43ed3e6c9fb.tar.bz2 | |
The WebResourceService was overrunning the int value used to store the time used to update the NTP cache -- thus the cache wasn't being updated soon enough.
BUG=71129
TEST=Promos appear immediately if enabled on the correct build; no need to reload or restart browser.
Review URL: http://codereview.chromium.org/6336017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
| -rw-r--r-- | chrome/browser/web_resource/web_resource_service.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 27dfe84..3225b92 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -68,7 +68,7 @@ class WebResourceService::WebResourceFetcher // Delay initial load of resource data into cache so as not to interfere // with startup time. - void StartAfterDelay(int delay_ms) { + void StartAfterDelay(int64 delay_ms) { MessageLoop::current()->PostDelayedTask(FROM_HERE, fetcher_factory_.NewRunnableMethod(&WebResourceFetcher::StartFetch), delay_ms); @@ -282,11 +282,11 @@ void WebResourceService::WebResourceStateChange() { void WebResourceService::ScheduleNotification(double promo_start, double promo_end) { if (promo_start > 0 && promo_end > 0 && !web_resource_update_scheduled_) { - int ms_until_start = - static_cast<int>((base::Time::FromDoubleT( + int64 ms_until_start = + static_cast<int64>((base::Time::FromDoubleT( promo_start) - base::Time::Now()).InMilliseconds()); - int ms_until_end = - static_cast<int>((base::Time::FromDoubleT( + int64 ms_until_end = + static_cast<int64>((base::Time::FromDoubleT( promo_end) - base::Time::Now()).InMilliseconds()); if (ms_until_start > 0) { web_resource_update_scheduled_ = true; @@ -310,7 +310,7 @@ void WebResourceService::ScheduleNotification(double promo_start, } void WebResourceService::StartAfterDelay() { - int delay = kStartResourceFetchDelay; + int64 delay = kStartResourceFetchDelay; // Check whether we have ever put a value in the web resource cache; // if so, pull it out and see if it's time to update again. if (prefs_->HasPrefPath(prefs::kNTPWebResourceCacheUpdate)) { @@ -319,8 +319,8 @@ void WebResourceService::StartAfterDelay() { if (!last_update_pref.empty()) { double last_update_value; base::StringToDouble(last_update_pref, &last_update_value); - int ms_until_update = cache_update_delay_ - - static_cast<int>((base::Time::Now() - base::Time::FromDoubleT( + int64 ms_until_update = cache_update_delay_ - + static_cast<int64>((base::Time::Now() - base::Time::FromDoubleT( last_update_value)).InMilliseconds()); delay = ms_until_update > cache_update_delay_ ? cache_update_delay_ : (ms_until_update < kStartResourceFetchDelay ? @@ -328,7 +328,7 @@ void WebResourceService::StartAfterDelay() { } } // Start fetch and wait for UpdateResourceCache. - web_resource_fetcher_->StartAfterDelay(static_cast<int>(delay)); + web_resource_fetcher_->StartAfterDelay(delay); } void WebResourceService::UpdateResourceCache(const std::string& json_data) { |