Chromium Code Reviews| Index: chrome/browser/extensions/api/alarms/alarm_manager.cc |
| diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc |
| index 582257cb9094c54b87633756c48998df7a975218..22cca30ce37a0c82fdea2981d691643fe76d575c 100644 |
| --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc |
| +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc |
| @@ -328,11 +328,11 @@ void AlarmManager::ScheduleNextPoll() { |
| soonest_alarm_time = cur_alarm_time; |
| if (l_it->granularity < min_granularity) |
| min_granularity = l_it->granularity; |
| - base::TimeDelta cur_alarm_delta = cur_alarm_time - clock_->Now(); |
| + base::TimeDelta cur_alarm_delta = cur_alarm_time - last_poll_time_; |
|
Devlin
2014/01/17 17:25:04
Slight tweak from Matt's solution here - I think t
|
| + if (cur_alarm_delta < l_it->minimum_granularity) |
| + cur_alarm_delta = l_it->minimum_granularity; |
| if (cur_alarm_delta < min_granularity) |
| min_granularity = cur_alarm_delta; |
| - if (min_granularity < l_it->minimum_granularity) |
| - min_granularity = l_it->minimum_granularity; |
| } |
| } |