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/shelf/shelf_widget.h | |
| 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/shelf/shelf_widget.h')
| -rw-r--r-- | ash/shelf/shelf_widget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h index 97cf7ff..3ffb305 100644 --- a/ash/shelf/shelf_widget.h +++ b/ash/shelf/shelf_widget.h @@ -82,7 +82,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, // Overridden from views::WidgetObserver: virtual void OnWidgetActivationChanged( - views::Widget* widget, bool active) OVERRIDE; + views::Widget* widget, bool active) override; // A function to test the current alpha used by the dimming bar. If there is // no dimmer active, the function will return -1. @@ -96,7 +96,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, void DisableDimmingAnimationsForTest(); // ShelfLayoutManagerObserver overrides: - virtual void WillDeleteShelf() OVERRIDE; + virtual void WillDeleteShelf() override; private: class DelegateView; |