| Index: extensions/browser/api/alarms/alarms_api.cc
|
| diff --git a/extensions/browser/api/alarms/alarms_api.cc b/extensions/browser/api/alarms/alarms_api.cc
|
| index c6911330d2d53eee427c1c5b79ce2d320b0a5fca..ea01ea24fa262cf2bf7bf9d04f3140e257825793 100644
|
| --- a/extensions/browser/api/alarms/alarms_api.cc
|
| +++ b/extensions/browser/api/alarms/alarms_api.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/time/default_clock.h"
|
| #include "base/values.h"
|
| #include "extensions/browser/api/alarms/alarm_manager.h"
|
| +#include "extensions/browser/api/alarms/alarms_api_constants.h"
|
| #include "extensions/common/api/alarms.h"
|
| #include "extensions/common/error_utils.h"
|
|
|
| @@ -27,7 +28,6 @@ const char kBothRelativeAndAbsoluteTime[] =
|
| const char kNoScheduledTime[] =
|
| "Must set at least one of when, delayInMinutes, or periodInMinutes.";
|
| const int kReleaseDelayMinimum = 1;
|
| -const int kDevDelayMinimum = 0;
|
|
|
| bool ValidateAlarmCreateInfo(const std::string& alarm_name,
|
| const alarms::AlarmCreateInfo& create_info,
|
| @@ -118,12 +118,15 @@ bool AlarmsCreateFunction::RunAsync() {
|
| it != warnings.end(); ++it)
|
| WriteToConsole(content::CONSOLE_MESSAGE_LEVEL_WARNING, *it);
|
|
|
| - Alarm alarm(alarm_name, params->alarm_info,
|
| - base::TimeDelta::FromMinutes(
|
| - Manifest::IsUnpackedLocation(extension()->location())
|
| - ? kDevDelayMinimum
|
| - : kReleaseDelayMinimum),
|
| - clock_->Now());
|
| + const int kSecondsPerMinute = 60;
|
| + base::TimeDelta granularity =
|
| + base::TimeDelta::FromSecondsD(
|
| + (Manifest::IsUnpackedLocation(extension()->location())
|
| + ? alarms_api_constants::kDevDelayMinimum
|
| + : kReleaseDelayMinimum)) *
|
| + kSecondsPerMinute;
|
| +
|
| + Alarm alarm(alarm_name, params->alarm_info, granularity, clock_->Now());
|
| AlarmManager::Get(browser_context())
|
| ->AddAlarm(extension_id(), alarm,
|
| base::Bind(&AlarmsCreateFunction::Callback, this));
|
|
|