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

Unified Diff: chrome/browser/extensions/api/alarms/alarm_manager.cc

Issue 23071003: Delta from the first fix. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
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 cb8883bcea23304d01256cb0016193ea548a7b8b..aa483ee9363e160ee2011a141b2f97e8ac6f8d22 100644
--- a/chrome/browser/extensions/api/alarms/alarm_manager.cc
+++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc
@@ -336,7 +336,7 @@ void AlarmManager::ScheduleNextPoll() {
next_poll = soonest_alarm_time;
// Schedule the poll.
- next_poll_time_ = next_poll;
+ test_next_poll_time_ = next_poll;
base::TimeDelta delay = std::max(base::TimeDelta::FromSeconds(0),
next_poll - clock_->Now());
timer_.Start(FROM_HERE,
@@ -362,7 +362,7 @@ void AlarmManager::PollAlarms() {
for (size_t i = cur_extension->second.size(); i > 0; --i) {
AlarmList::iterator cur_alarm = cur_extension->second.begin() + i - 1;
if (base::Time::FromJsTime(cur_alarm->js_alarm->scheduled_time) <=
- next_poll_time_) {
+ last_poll_time_) {
OnAlarm(make_pair(cur_extension, cur_alarm));
}
}
« no previous file with comments | « chrome/browser/extensions/api/alarms/alarm_manager.h ('k') | chrome/browser/extensions/api/alarms/alarms_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698