summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 16:57:05 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 23:58:04 +0000
commit1f4538e02ae35659abf7f9468639a1045924af50 (patch)
tree1e076638bbebe64689099c5ea5bd82bfa9c6b9aa /ash/shell.h
parente19d49ab07f57c16eb6685e7394ac4902e53382c (diff)
downloadchromium_src-1f4538e02ae35659abf7f9468639a1045924af50.zip
chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.tar.gz
chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.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=derat@chromium.org Review URL: https://codereview.chromium.org/680153002 Cr-Commit-Position: refs/heads/master@{#301490}
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 9e6e046..ea2382c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -589,7 +589,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// Takes ownership of |delegate|.
explicit Shell(ShellDelegate* delegate);
- virtual ~Shell();
+ ~Shell() override;
void Init(const ShellInitParams& init_params);
@@ -600,18 +600,18 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
void InitRootWindow(aura::Window* root_window);
// ash::SystemModalContainerEventFilterDelegate overrides:
- virtual bool CanWindowReceiveEvents(aura::Window* window) override;
+ bool CanWindowReceiveEvents(aura::Window* window) override;
// Overridden from ui::EventTarget:
- virtual bool CanAcceptEvent(const ui::Event& event) override;
- virtual EventTarget* GetParentTarget() override;
- virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
- virtual ui::EventTargeter* GetEventTargeter() override;
- virtual void OnEvent(ui::Event* event) override;
+ bool CanAcceptEvent(const ui::Event& event) override;
+ EventTarget* GetParentTarget() override;
+ scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
+ ui::EventTargeter* GetEventTargeter() override;
+ void OnEvent(ui::Event* event) override;
// Overridden from aura::client::ActivationChangeObserver:
- virtual void OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) override;
+ void OnWindowActivated(aura::Window* gained_active,
+ aura::Window* lost_active) override;
static Shell* instance_;