diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 09:23:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 16:24:05 +0000 |
| commit | 10d6b38a855066b1400d96d0600c6e2aec42cbf1 (patch) | |
| tree | 8df573d9a31973c64cd9c50e9a2a6a6fa5c49e82 /ash/system/audio/volume_view.cc | |
| parent | 90b32ca95485409ba5646c96a4ec0aa4b6216aee (diff) | |
| download | chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.zip chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.gz chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in ash/
BUG=417463
Review URL: https://codereview.chromium.org/621133002
Cr-Commit-Position: refs/heads/master@{#298040}
Diffstat (limited to 'ash/system/audio/volume_view.cc')
| -rw-r--r-- | ash/system/audio/volume_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/audio/volume_view.cc b/ash/system/audio/volume_view.cc index 2ae9f2e..821fb11 100644 --- a/ash/system/audio/volume_view.cc +++ b/ash/system/audio/volume_view.cc @@ -72,7 +72,7 @@ class VolumeButton : public views::ToggleImageButton { private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size = views::ToggleImageButton::GetPreferredSize(); size.set_height(kTrayPopupItemHeight); return size; @@ -118,12 +118,12 @@ class BarSeparator : public views::View { virtual ~BarSeparator() {} // Overriden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(kBarSeparatorWidth, kBarSeparatorHeight); } private: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(gfx::Rect(width() / 2, 0, 1, height()), kButtonStrokeColor); } |