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

Side by Side Diff: chrome/browser/extensions/api/alarms/alarms_api.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: Sinked. Created 8 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/alarms/alarms_api.h" 5 #include "chrome/browser/extensions/api/alarms/alarms_api.h"
6 6
7 #include "base/string_number_conversions.h"
7 #include "base/values.h" 8 #include "base/values.h"
8 #include "chrome/browser/extensions/api/alarms/alarm_manager.h" 9 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
9 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
10 #include "chrome/common/extensions/api/experimental.alarms.h" 11 #include "chrome/common/extensions/api/experimental.alarms.h"
11 #include "chrome/common/extensions/extension_error_utils.h" 12 #include "chrome/common/extensions/extension_error_utils.h"
12 13
13 namespace alarms = extensions::api::experimental_alarms; 14 namespace alarms = extensions::api::experimental_alarms;
14 15
15 namespace extensions { 16 namespace extensions {
16 17
17 namespace { 18 namespace {
18 19
19 const char kDefaultAlarmName[] = ""; 20 const char kDefaultAlarmName[] = "";
20 const char kAlarmNotFound[] = "No alarm named '*' exists."; 21 const char kAlarmNotFound[] = "No alarm named '*' exists.";
22 const char kDelayLessThanMinimum[] = "Delay is less than minimum of * minutes.";
23 const char kDelayIsNonInteger[] = "Delay is not an integer value.";
21 24
25 const int kReleaseDelayMinimum = 5;
26 const int kDevDelayMinimum = 0;
27
28 bool ValidateDelayTime(double delay_in_minutes,
29 const Extension* extension,
30 std::string* error) {
31 double delay_minimum = kDevDelayMinimum;
32 if (extension->location() != Extension::LOAD) {
33 // In release mode we check for integer delay values and a stricter delay
34 // minimum.
35 if (delay_in_minutes != static_cast<int>(delay_in_minutes)) {
36 *error = kDelayIsNonInteger;
37 return false;
38 }
39 delay_minimum = kReleaseDelayMinimum;
40 }
41
42 // Validate against our found delay minimum.
43 if (delay_in_minutes < delay_minimum) {
44 *error = ExtensionErrorUtils::FormatErrorMessage(kDelayLessThanMinimum,
45 base::DoubleToString(delay_minimum));
46 return false;
47 }
48 return true;
22 } 49 }
23 50
51 } // namespace
52
24 bool AlarmsCreateFunction::RunImpl() { 53 bool AlarmsCreateFunction::RunImpl() {
25 scoped_ptr<alarms::Create::Params> params( 54 scoped_ptr<alarms::Create::Params> params(
26 alarms::Create::Params::Create(*args_)); 55 alarms::Create::Params::Create(*args_));
27 EXTENSION_FUNCTION_VALIDATE(params.get()); 56 EXTENSION_FUNCTION_VALIDATE(params.get());
28 57
58 double delay_in_minutes = params->alarm_info.delay_in_minutes;
59 if (!ValidateDelayTime(delay_in_minutes, GetExtension(), &error_))
60 return false;
61
29 linked_ptr<AlarmManager::Alarm> alarm(new AlarmManager::Alarm()); 62 linked_ptr<AlarmManager::Alarm> alarm(new AlarmManager::Alarm());
30 alarm->name = params->name.get() ? *params->name : kDefaultAlarmName; 63 alarm->name = params->name.get() ? *params->name : kDefaultAlarmName;
31 alarm->delay_in_seconds = params->alarm_info.delay_in_seconds; 64 alarm->delay_in_minutes = params->alarm_info.delay_in_minutes;
32 alarm->repeating = params->alarm_info.repeating.get() ? 65 alarm->repeating = params->alarm_info.repeating.get() ?
33 *params->alarm_info.repeating : false; 66 *params->alarm_info.repeating : false;
34 ExtensionSystem::Get(profile())->alarm_manager()->AddAlarm( 67 ExtensionSystem::Get(profile())->alarm_manager()->AddAlarm(
35 extension_id(), alarm); 68 extension_id(), alarm);
36 69
37 return true; 70 return true;
38 } 71 }
39 72
40 bool AlarmsGetFunction::RunImpl() { 73 bool AlarmsGetFunction::RunImpl() {
41 scoped_ptr<alarms::Get::Params> params( 74 scoped_ptr<alarms::Get::Params> params(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 return true; 118 return true;
86 } 119 }
87 120
88 bool AlarmsClearAllFunction::RunImpl() { 121 bool AlarmsClearAllFunction::RunImpl() {
89 ExtensionSystem::Get(profile())->alarm_manager()->RemoveAllAlarms( 122 ExtensionSystem::Get(profile())->alarm_manager()->RemoveAllAlarms(
90 extension_id()); 123 extension_id());
91 return true; 124 return true;
92 } 125 }
93 126
94 } // namespace extensions 127 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/alarms/alarm_manager.cc ('k') | chrome/browser/extensions/api/alarms/alarms_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698