summaryrefslogtreecommitdiffstats
path: root/ash/wm/lock_window_state.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 18:26:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 01:26:59 +0000
commit28401c280ebf802265ef7f387a0ecfe784551e16 (patch)
tree0ddebc66a830257aa8432737410ffd4a3f5f2baf /ash/wm/lock_window_state.h
parent07d12f74065fb3d107bb2abbab6432d492b62c1d (diff)
downloadchromium_src-28401c280ebf802265ef7f387a0ecfe784551e16.zip
chromium_src-28401c280ebf802265ef7f387a0ecfe784551e16.tar.gz
chromium_src-28401c280ebf802265ef7f387a0ecfe784551e16.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=flackr@chromium.org Review URL: https://codereview.chromium.org/645513008 Cr-Commit-Position: refs/heads/master@{#301541}
Diffstat (limited to 'ash/wm/lock_window_state.h')
-rw-r--r--ash/wm/lock_window_state.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/wm/lock_window_state.h b/ash/wm/lock_window_state.h
index c17faf7..33a5b0b 100644
--- a/ash/wm/lock_window_state.h
+++ b/ash/wm/lock_window_state.h
@@ -18,15 +18,15 @@ class LockWindowState : public wm::WindowState::State {
// The |window|'s state object will be modified to use this new window mode
// state handler.
explicit LockWindowState(aura::Window* window);
- virtual ~LockWindowState();
+ ~LockWindowState() override;
// WindowState::State overrides:
- virtual void OnWMEvent(wm::WindowState* window_state,
- const wm::WMEvent* event) override;
- virtual wm::WindowStateType GetType() const override;
- virtual void AttachState(wm::WindowState* window_state,
- wm::WindowState::State* previous_state) override;
- virtual void DetachState(wm::WindowState* window_state) override;
+ void OnWMEvent(wm::WindowState* window_state,
+ const wm::WMEvent* event) override;
+ wm::WindowStateType GetType() const override;
+ void AttachState(wm::WindowState* window_state,
+ wm::WindowState::State* previous_state) override;
+ void DetachState(wm::WindowState* window_state) override;
// Creates new LockWindowState instance and attaches it to |window|.
static wm::WindowState* SetLockWindowState(aura::Window* window);