| Index: chrome/browser/notifications/notification_test_util.h
|
| diff --git a/chrome/browser/notifications/notification_test_util.h b/chrome/browser/notifications/notification_test_util.h
|
| index 58ff2b40056d3590df9f13493fc23c152fbc0f82..ff3b2f6c2b89e790a6494b986e1f8aa1db426748 100644
|
| --- a/chrome/browser/notifications/notification_test_util.h
|
| +++ b/chrome/browser/notifications/notification_test_util.h
|
| @@ -22,12 +22,12 @@ class MockNotificationDelegate : public NotificationDelegate {
|
| explicit MockNotificationDelegate(const std::string& id);
|
|
|
| // NotificationDelegate interface.
|
| - virtual void Display() OVERRIDE {}
|
| - virtual void Error() OVERRIDE {}
|
| - virtual void Close(bool by_user) OVERRIDE {}
|
| - virtual void Click() OVERRIDE {}
|
| - virtual std::string id() const OVERRIDE;
|
| - virtual content::WebContents* GetWebContents() const OVERRIDE;
|
| + virtual void Display() override {}
|
| + virtual void Error() override {}
|
| + virtual void Close(bool by_user) override {}
|
| + virtual void Click() override {}
|
| + virtual std::string id() const override;
|
| + virtual content::WebContents* GetWebContents() const override;
|
|
|
| private:
|
| virtual ~MockNotificationDelegate();
|
| @@ -49,28 +49,28 @@ class LoggingNotificationDelegate : public NotificationDelegate {
|
| explicit LoggingNotificationDelegate(std::string id) : notification_id_(id) {}
|
|
|
| // NotificationObjectProxy override
|
| - virtual void Display() OVERRIDE {
|
| + virtual void Display() override {
|
| Logger::log("notification displayed\n");
|
| }
|
| - virtual void Error() OVERRIDE {
|
| + virtual void Error() override {
|
| Logger::log("notification error\n");
|
| }
|
| - virtual void Click() OVERRIDE {
|
| + virtual void Click() override {
|
| Logger::log("notification clicked\n");
|
| }
|
| - virtual void ButtonClick(int index) OVERRIDE {
|
| + virtual void ButtonClick(int index) override {
|
| Logger::log("notification button clicked\n");
|
| }
|
| - virtual void Close(bool by_user) OVERRIDE {
|
| + virtual void Close(bool by_user) override {
|
| if (by_user)
|
| Logger::log("notification closed by user\n");
|
| else
|
| Logger::log("notification closed by script\n");
|
| }
|
| - virtual std::string id() const OVERRIDE {
|
| + virtual std::string id() const override {
|
| return notification_id_;
|
| }
|
| - virtual content::WebContents* GetWebContents() const OVERRIDE {
|
| + virtual content::WebContents* GetWebContents() const override {
|
| return NULL;
|
| }
|
|
|
| @@ -86,36 +86,36 @@ class StubNotificationUIManager : public NotificationUIManager {
|
| virtual ~StubNotificationUIManager();
|
|
|
| // Adds a notification to be displayed. Virtual for unit test override.
|
| - virtual void Add(const Notification& notification, Profile* profile) OVERRIDE;
|
| + virtual void Add(const Notification& notification, Profile* profile) override;
|
| virtual bool Update(const Notification& notification,
|
| - Profile* profile) OVERRIDE;
|
| + Profile* profile) override;
|
|
|
| // Returns NULL if no notifications match the supplied ID, either currently
|
| // displayed or in the queue.
|
| virtual const Notification* FindById(const std::string& delegate_id,
|
| - ProfileID profile_id) const OVERRIDE;
|
| + ProfileID profile_id) const override;
|
|
|
| // Removes any notifications matching the supplied ID, either currently
|
| // displayed or in the queue. Returns true if anything was removed.
|
| virtual bool CancelById(const std::string& delegate_id,
|
| - ProfileID profile_id) OVERRIDE;
|
| + ProfileID profile_id) override;
|
|
|
| // Adds the delegate_id for each outstanding notification to the set
|
| // |delegate_ids| (must not be NULL).
|
| virtual std::set<std::string> GetAllIdsByProfileAndSourceOrigin(
|
| Profile* profile,
|
| - const GURL& source) OVERRIDE;
|
| + const GURL& source) override;
|
|
|
| // Removes notifications matching the |source_origin| (which could be an
|
| // extension ID). Returns true if anything was removed.
|
| - virtual bool CancelAllBySourceOrigin(const GURL& source_origin) OVERRIDE;
|
| + virtual bool CancelAllBySourceOrigin(const GURL& source_origin) override;
|
|
|
| // Removes notifications matching |profile|. Returns true if any were removed.
|
| - virtual bool CancelAllByProfile(ProfileID profile_id) OVERRIDE;
|
| + virtual bool CancelAllByProfile(ProfileID profile_id) override;
|
|
|
| // Cancels all pending notifications and closes anything currently showing.
|
| // Used when the app is terminating.
|
| - virtual void CancelAll() OVERRIDE;
|
| + virtual void CancelAll() override;
|
|
|
| // Test hook to get the notification so we can check it
|
| const Notification& notification() const { return notification_; }
|
|
|