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/sticky_keys | |
| 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/sticky_keys')
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay.cc | 2 | ||||
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay.h | 6 | ||||
| -rw-r--r-- | ash/sticky_keys/sticky_keys_unittest.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc index 5b239f7..9edbec3 100644 --- a/ash/sticky_keys/sticky_keys_overlay.cc +++ b/ash/sticky_keys/sticky_keys_overlay.cc @@ -108,7 +108,7 @@ class StickyKeysOverlayView : public views::WidgetDelegateView { virtual ~StickyKeysOverlayView(); // views::WidgetDelegateView overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; void SetKeyState(ui::EventFlags modifier, StickyKeyState state); diff --git a/ash/sticky_keys/sticky_keys_overlay.h b/ash/sticky_keys/sticky_keys_overlay.h index e60d074..34ea266c 100644 --- a/ash/sticky_keys/sticky_keys_overlay.h +++ b/ash/sticky_keys/sticky_keys_overlay.h @@ -57,11 +57,11 @@ class ASH_EXPORT StickyKeysOverlay : public ui::LayerAnimationObserver { // gfx::LayerAnimationObserver overrides: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; bool is_visible_; scoped_ptr<views::Widget> overlay_widget_; diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc index 6505b65..feb56ad 100644 --- a/ash/sticky_keys/sticky_keys_unittest.cc +++ b/ash/sticky_keys/sticky_keys_unittest.cc @@ -34,7 +34,7 @@ class StickyKeysTest : public test::AshTestBase { : target_(NULL), root_window_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); // |target_| owned by root window of shell. It is still safe to delete @@ -45,7 +45,7 @@ class StickyKeysTest : public test::AshTestBase { ui::SetUpTouchPadForTest(kTouchPadDeviceId); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test::AshTestBase::TearDown(); } |