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

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

Issue 10217018: Alarm resolution changed to minutes and minimum delay added. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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
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 f6c508012f96ad3865888c74cfd67e9a17be1bfe..08f0681427e19c071eff0df904ca01db56bc8a00 100644
--- a/chrome/browser/extensions/api/alarms/alarm_manager.cc
+++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc
@@ -55,8 +55,9 @@ AlarmManager::~AlarmManager() {
void AlarmManager::AddAlarm(const std::string& extension_id,
const linked_ptr<Alarm>& alarm) {
- AddAlarmImpl(extension_id, alarm,
- base::TimeDelta::FromSeconds(alarm->delay_in_seconds));
+ base::TimeDelta alarm_time = base::TimeDelta::FromMicroseconds(
+ alarm->delay_in_minutes * base::Time::kMicrosecondsPerMinute);
+ AddAlarmImpl(extension_id, alarm, alarm_time);
WriteToPrefs(extension_id);
}
@@ -141,10 +142,11 @@ void AlarmManager::OnAlarm(const std::string& extension_id,
// Restart the timer, since it may have been set with a shorter delay
// initially.
base::Timer* timer = timers_[alarm].get();
- timer->Start(FROM_HERE,
- base::TimeDelta::FromSeconds(alarm->delay_in_seconds),
- base::Bind(&AlarmManager::OnAlarm, base::Unretained(this),
- extension_id, alarm->name));
+ base::TimeDelta alarm_time = base::TimeDelta::FromMicroseconds(
+ alarm->delay_in_minutes * base::Time::kMicrosecondsPerMinute);
+ timer->Start(FROM_HERE, alarm_time,
+ base::Bind(&AlarmManager::OnAlarm, base::Unretained(this),
+ extension_id, alarm->name));
}
WriteToPrefs(extension_id);
« no previous file with comments | « no previous file | chrome/browser/extensions/api/alarms/alarms_api.h » ('j') | chrome/browser/extensions/api/alarms/alarms_api.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698