summaryrefslogtreecommitdiffstats
path: root/components/infobars
diff options
context:
space:
mode:
Diffstat (limited to 'components/infobars')
-rw-r--r--components/infobars/core/confirm_infobar_delegate.h12
-rw-r--r--components/infobars/core/infobar.h6
-rw-r--r--components/infobars/core/infobar_container.h9
3 files changed, 12 insertions, 15 deletions
diff --git a/components/infobars/core/confirm_infobar_delegate.h b/components/infobars/core/confirm_infobar_delegate.h
index f88206c..1e1930d 100644
--- a/components/infobars/core/confirm_infobar_delegate.h
+++ b/components/infobars/core/confirm_infobar_delegate.h
@@ -23,10 +23,10 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
BUTTON_CANCEL = 1 << 1,
};
- virtual ~ConfirmInfoBarDelegate();
+ ~ConfirmInfoBarDelegate() override;
// Returns the InfoBar type to be displayed for the InfoBar.
- virtual InfoBarAutomationType GetInfoBarAutomationType() const override;
+ InfoBarAutomationType GetInfoBarAutomationType() const override;
// Returns the message string to be displayed for the InfoBar.
virtual base::string16 GetMessageText() const = 0;
@@ -70,14 +70,12 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
static scoped_ptr<infobars::InfoBar> CreateInfoBar(
scoped_ptr<ConfirmInfoBarDelegate> delegate);
- virtual bool ShouldExpireInternal(
- const NavigationDetails& details) const override;
+ bool ShouldExpireInternal(const NavigationDetails& details) const override;
private:
// InfoBarDelegate:
- virtual bool EqualsDelegate(
- infobars::InfoBarDelegate* delegate) const override;
- virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() override;
+ bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
+ ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() override;
DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate);
};
diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h
index 86d0f0d..6124d88 100644
--- a/components/infobars/core/infobar.h
+++ b/components/infobars/core/infobar.h
@@ -51,7 +51,7 @@ class InfoBar : public gfx::AnimationDelegate {
static const int kMaximumArrowTargetHalfWidth;
explicit InfoBar(scoped_ptr<InfoBarDelegate> delegate);
- virtual ~InfoBar();
+ ~InfoBar() override;
static SkColor GetTopColor(InfoBarDelegate::Type infobar_type);
static SkColor GetBottomColor(InfoBarDelegate::Type infobar_type);
@@ -98,7 +98,7 @@ class InfoBar : public gfx::AnimationDelegate {
protected:
// gfx::AnimationDelegate:
- virtual void AnimationProgressed(const gfx::Animation* animation) override;
+ void AnimationProgressed(const gfx::Animation* animation) override;
const InfoBarContainer* container() const { return container_; }
InfoBarContainer* container() { return container_; }
@@ -116,7 +116,7 @@ class InfoBar : public gfx::AnimationDelegate {
private:
// gfx::AnimationDelegate:
- virtual void AnimationEnded(const gfx::Animation* animation) override;
+ void AnimationEnded(const gfx::Animation* animation) override;
// Finds the new desired arrow and bar heights, and if they differ from the
// current ones, calls PlatformSpecificOnHeightRecalculated(). Informs our
diff --git a/components/infobars/core/infobar_container.h b/components/infobars/core/infobar_container.h
index eda97aa..f802ab1 100644
--- a/components/infobars/core/infobar_container.h
+++ b/components/infobars/core/infobar_container.h
@@ -102,11 +102,10 @@ class InfoBarContainer : public InfoBarManager::Observer {
typedef std::vector<InfoBar*> InfoBars;
// InfoBarManager::Observer:
- virtual void OnInfoBarAdded(InfoBar* infobar) override;
- virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) override;
- virtual void OnInfoBarReplaced(InfoBar* old_infobar,
- InfoBar* new_infobar) override;
- virtual void OnManagerShuttingDown(InfoBarManager* manager) override;
+ void OnInfoBarAdded(InfoBar* infobar) override;
+ void OnInfoBarRemoved(InfoBar* infobar, bool animate) override;
+ void OnInfoBarReplaced(InfoBar* old_infobar, InfoBar* new_infobar) override;
+ void OnManagerShuttingDown(InfoBarManager* manager) override;
// Adds |infobar| to this container before the existing infobar at position
// |position| and calls Show() on it. |animate| is passed along to