summaryrefslogtreecommitdiffstats
path: root/ash/shell/window_watcher_shelf_item_delegate.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 18:14:13 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 01:14:38 +0000
commitf59635116303ce62fcc95a647df72c77e0129eee (patch)
tree36936f9080f5b7351ad427d4f1a62165f2440e3f /ash/shell/window_watcher_shelf_item_delegate.h
parentfa85b15991d5df67e3adf18a46a1c0fdca163568 (diff)
downloadchromium_src-f59635116303ce62fcc95a647df72c77e0129eee.zip
chromium_src-f59635116303ce62fcc95a647df72c77e0129eee.tar.gz
chromium_src-f59635116303ce62fcc95a647df72c77e0129eee.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=jamescook@chromium.org Review URL: https://codereview.chromium.org/679283002 Cr-Commit-Position: refs/heads/master@{#301535}
Diffstat (limited to 'ash/shell/window_watcher_shelf_item_delegate.h')
-rw-r--r--ash/shell/window_watcher_shelf_item_delegate.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index 1da99d7..117156b 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -19,16 +19,16 @@ class WindowWatcher;
class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
public:
WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher);
- virtual ~WindowWatcherShelfItemDelegate();
+ ~WindowWatcherShelfItemDelegate() override;
// ShelfItemDelegate:
- virtual bool ItemSelected(const ui::Event& event) override;
- virtual base::string16 GetTitle() override;
- virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
- virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
- virtual bool IsDraggable() override;
- virtual bool ShouldShowTooltip() override;
- virtual void Close() override;
+ bool ItemSelected(const ui::Event& event) override;
+ base::string16 GetTitle() override;
+ ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
+ ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
+ bool IsDraggable() override;
+ bool ShouldShowTooltip() override;
+ void Close() override;
private:
ShelfID id_;