summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/notifications
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/notifications')
-rw-r--r--chrome/browser/extensions/api/notifications/notifications_api.cc18
-rw-r--r--chrome/browser/extensions/api/notifications/notifications_api.h14
-rw-r--r--chrome/browser/extensions/api/notifications/notifications_apitest.cc2
3 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index 631dbf4..d5e6e56 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -85,11 +85,11 @@ class NotificationsApiDelegate : public NotificationDelegate {
DCHECK(api_function_.get());
}
- virtual void Display() OVERRIDE { }
+ virtual void Display() override { }
- virtual void Error() OVERRIDE {}
+ virtual void Error() override {}
- virtual void Close(bool by_user) OVERRIDE {
+ virtual void Close(bool by_user) override {
EventRouter::UserGestureState gesture =
by_user ? EventRouter::USER_GESTURE_ENABLED
: EventRouter::USER_GESTURE_NOT_ENABLED;
@@ -98,19 +98,19 @@ class NotificationsApiDelegate : public NotificationDelegate {
SendEvent(notifications::OnClosed::kEventName, gesture, args.Pass());
}
- virtual void Click() OVERRIDE {
+ virtual void Click() override {
scoped_ptr<base::ListValue> args(CreateBaseEventArgs());
SendEvent(notifications::OnClicked::kEventName,
EventRouter::USER_GESTURE_ENABLED,
args.Pass());
}
- virtual bool HasClickedListener() OVERRIDE {
+ virtual bool HasClickedListener() override {
return EventRouter::Get(profile_)->HasEventListener(
notifications::OnClicked::kEventName);
}
- virtual void ButtonClick(int index) OVERRIDE {
+ virtual void ButtonClick(int index) override {
scoped_ptr<base::ListValue> args(CreateBaseEventArgs());
args->Append(new base::FundamentalValue(index));
SendEvent(notifications::OnButtonClicked::kEventName,
@@ -118,11 +118,11 @@ class NotificationsApiDelegate : public NotificationDelegate {
args.Pass());
}
- virtual std::string id() const OVERRIDE {
+ virtual std::string id() const override {
return scoped_id_;
}
- virtual content::WebContents* GetWebContents() const OVERRIDE {
+ virtual content::WebContents* GetWebContents() const override {
// We're holding a reference to api_function_, so we know it'll be valid
// until ReleaseRVH is called, and api_function_ (as a
// AsyncExtensionFunction) will zero out its copy of render_view_host
@@ -135,7 +135,7 @@ class NotificationsApiDelegate : public NotificationDelegate {
return content::WebContents::FromRenderViewHost(rvh);
}
- virtual void ReleaseRenderViewHost() OVERRIDE {
+ virtual void ReleaseRenderViewHost() override {
api_function_ = NULL;
}
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.h b/chrome/browser/extensions/api/notifications/notifications_api.h
index bd1b511..2f130b5d 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.h
+++ b/chrome/browser/extensions/api/notifications/notifications_api.h
@@ -45,7 +45,7 @@ class NotificationsApiFunction : public ChromeAsyncExtensionFunction {
virtual bool RunNotificationsApi() = 0;
// UITHreadExtensionFunction:
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
message_center::NotificationType MapApiTemplateTypeToType(
api::notifications::TemplateType type);
@@ -56,7 +56,7 @@ class NotificationsCreateFunction : public NotificationsApiFunction {
NotificationsCreateFunction();
// NotificationsApiFunction:
- virtual bool RunNotificationsApi() OVERRIDE;
+ virtual bool RunNotificationsApi() override;
protected:
virtual ~NotificationsCreateFunction();
@@ -72,7 +72,7 @@ class NotificationsUpdateFunction : public NotificationsApiFunction {
NotificationsUpdateFunction();
// NotificationsApiFunction:
- virtual bool RunNotificationsApi() OVERRIDE;
+ virtual bool RunNotificationsApi() override;
protected:
virtual ~NotificationsUpdateFunction();
@@ -88,7 +88,7 @@ class NotificationsClearFunction : public NotificationsApiFunction {
NotificationsClearFunction();
// NotificationsApiFunction:
- virtual bool RunNotificationsApi() OVERRIDE;
+ virtual bool RunNotificationsApi() override;
protected:
virtual ~NotificationsClearFunction();
@@ -104,7 +104,7 @@ class NotificationsGetAllFunction : public NotificationsApiFunction {
NotificationsGetAllFunction();
// NotificationsApiFunction:
- virtual bool RunNotificationsApi() OVERRIDE;
+ virtual bool RunNotificationsApi() override;
protected:
virtual ~NotificationsGetAllFunction();
@@ -119,8 +119,8 @@ class NotificationsGetPermissionLevelFunction
NotificationsGetPermissionLevelFunction();
// NotificationsApiFunction:
- virtual bool CanRunWhileDisabled() const OVERRIDE;
- virtual bool RunNotificationsApi() OVERRIDE;
+ virtual bool CanRunWhileDisabled() const override;
+ virtual bool RunNotificationsApi() override;
protected:
virtual ~NotificationsGetPermissionLevelFunction();
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index f9b10f0..d786df6 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -60,7 +60,7 @@ class UserGestureCatcher : public content::NotificationObserver {
private:
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE {
+ const content::NotificationDetails& details) override {
results_.push_back(
static_cast<content::Source<extensions::TestSendMessageFunction> >(
source)