diff options
author | mostynb <mostynb@opera.com> | 2014-10-03 17:40:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 00:40:55 +0000 |
commit | a15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch) | |
tree | 10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/api/alarms | |
parent | e7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff) | |
download | chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2 |
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463
Review URL: https://codereview.chromium.org/624153002
Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/api/alarms')
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc index 8274800..98705a8 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc @@ -42,7 +42,7 @@ class DefaultAlarmDelegate : public AlarmManager::Delegate { virtual ~DefaultAlarmDelegate() {} virtual void OnAlarm(const std::string& extension_id, - const Alarm& alarm) OVERRIDE { + const Alarm& alarm) override { scoped_ptr<base::ListValue> args(new base::ListValue()); args->Append(alarm.js_alarm->ToValue().release()); scoped_ptr<Event> event(new Event(alarms::OnAlarm::kEventName, diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.h b/chrome/browser/extensions/api/alarms/alarm_manager.h index 6912ee2..a0c9711 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.h +++ b/chrome/browser/extensions/api/alarms/alarm_manager.h @@ -203,11 +203,11 @@ class AlarmManager : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/api/alarms/alarms_api.h b/chrome/browser/extensions/api/alarms/alarms_api.h index 4bbe3398..20e68d0 100644 --- a/chrome/browser/extensions/api/alarms/alarms_api.h +++ b/chrome/browser/extensions/api/alarms/alarms_api.h @@ -27,7 +27,7 @@ class AlarmsCreateFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsCreateFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("alarms.create", ALARMS_CREATE) private: void Callback(); @@ -44,7 +44,7 @@ class AlarmsGetFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsGetFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const std::string& name, Alarm* alarm); @@ -56,7 +56,7 @@ class AlarmsGetAllFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsGetAllFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const AlarmList* alarms); @@ -68,7 +68,7 @@ class AlarmsClearFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsClearFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const std::string& name, bool success); @@ -80,7 +80,7 @@ class AlarmsClearAllFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsClearAllFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(); diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc index 77e36a4..f3c2d00 100644 --- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc +++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc @@ -32,7 +32,7 @@ class AlarmDelegate : public AlarmManager::Delegate { public: virtual ~AlarmDelegate() {} virtual void OnAlarm(const std::string& extension_id, - const Alarm& alarm) OVERRIDE { + const Alarm& alarm) override { alarms_seen.push_back(alarm.js_alarm->name); if (base::MessageLoop::current()->is_running()) base::MessageLoop::current()->Quit(); |