| 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 7a2a8c27fea956fea0588d9d72e61ed438413b12..102bce4f8631da89641d5bc81c55d7afdcc03eb7 100644
|
| --- a/extensions/browser/api/alarms/alarms_api.cc
|
| +++ b/extensions/browser/api/alarms/alarms_api.cc
|
| @@ -162,16 +162,12 @@ bool AlarmsGetAllFunction::RunAsync() {
|
| }
|
|
|
| void AlarmsGetAllFunction::Callback(const AlarmList* alarms) {
|
| + scoped_ptr<base::ListValue> alarms_value(new base::ListValue());
|
| if (alarms) {
|
| - std::vector<linked_ptr<alarms::Alarm>> create_arg;
|
| - create_arg.reserve(alarms->size());
|
| - for (size_t i = 0, size = alarms->size(); i < size; ++i) {
|
| - create_arg.push_back((*alarms)[i].js_alarm);
|
| - }
|
| - results_ = alarms::GetAll::Results::Create(create_arg);
|
| - } else {
|
| - SetResult(new base::ListValue());
|
| + for (const Alarm& alarm : *alarms)
|
| + alarms_value->Append(alarm.js_alarm->ToValue());
|
| }
|
| + SetResult(std::move(alarms_value));
|
| SendResponse(true);
|
| }
|
|
|
|
|